use new rubocop (v3) style guide on openstudio resources s3

NREL · May 9, 2020 · e07a3dc · e07a3dc
1 parent 7de168b
commit e07a3dc
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 44 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -6,5 +6,5 @@ AllCops:
     - lib/openstudio/extension/core/**/*
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
 
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in openstudio-extension.gemspec

diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 ########################################################################################################################
 #  openstudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
 #

diff --git a/bin/console b/bin/console
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'openstudio/extension'

diff --git a/lib/change_log.rb b/lib/change_log.rb
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 require 'octokit'
 require 'date'

diff --git a/lib/measures/openstudio_extension_test_measure/measure.rb b/lib/measures/openstudio_extension_test_measure/measure.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/measures/openstudio_extension_test_measure/tests/OpenStudioExtensionTestMeasure_Test.rb b/lib/measures/openstudio_extension_test_measure/tests/OpenStudioExtensionTestMeasure_Test.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/openstudio-extension.rb b/lib/openstudio-extension.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/openstudio/extension.rb b/lib/openstudio/extension.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/lib/openstudio/extension/rake_task.rb b/lib/openstudio/extension/rake_task.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -177,7 +175,7 @@ def setup_subtasks(name)
               results = bcl.search(keyword, "fq[]=bundle:nrel_measure&show_rows=#{num_results}", false)
               puts "there are #{results[:result].count} results"
               results[:result].each do |res|
-                puts (res[:measure][:name]).to_s
+                puts(res[:measure][:name]).to_s
               end
             end
 

diff --git a/lib/openstudio/extension/runner.rb b/lib/openstudio/extension/runner.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -563,12 +561,12 @@ def update_copyright(root_dir, doc_templates_dir)
         puts "Encoding.default_internal = #{Encoding.default_internal}"
 
         paths.each do |path|
-          Dir[path[:glob]].each do |file|
-            puts "Updating license in file #{file}"
-            f = File.read(file)
+          Dir[path[:glob]].each do |dir_file|
+            puts "Updating license in file #{dir_file}"
+            f = File.read(dir_file)
             if f.match?(path[:regex])
               puts '  License found -- updating'
-              File.open(file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
+              File.open(dir_file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
             elsif f =~ /\(C\)/i || f =~ /\(Copyright\)/i
               puts '  File already has copyright -- skipping'
             else
@@ -577,7 +575,7 @@ def update_copyright(root_dir, doc_templates_dir)
                 puts '  CANNOT add license to file automatically, add it manually and it will update automatically in the future'
                 next
               end
-              File.open(file, 'w') { |write| write << f.insert(0, path[:license] + "\n") }
+              File.open(dir_file, 'w') { |write| write << f.insert(0, path[:license] + "\n") }
             end
           end
         end

diff --git a/lib/openstudio/extension/runner_config.rb b/lib/openstudio/extension/runner_config.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -40,7 +38,7 @@
 module OpenStudio
   module Extension
     class RunnerConfig
-      FILENAME = 'runner.conf'
+      FILENAME = 'runner.conf'.freeze
 
       ##
       # Class to store configuration of the runner options.

diff --git a/lib/openstudio/extension/version.rb b/lib/openstudio/extension/version.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -37,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.2.2'
+    VERSION = '0.2.2'.freeze
   end
 end
diff --git a/openstudio-extension.gemspec b/openstudio-extension.gemspec
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'openstudio/extension/version'
@@ -30,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.5.0'
 
-  spec.add_dependency 'bcl', '~> 0.6.0'
+  spec.add_dependency 'bcl', '~> 0.6.1'
   spec.add_dependency 'bundler', '~> 2.1'
   spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
   spec.add_dependency 'openstudio-workflow', '~> 2.0.0'

diff --git a/spec/openstudio/core/os_lib_geometry_spec.rb b/spec/openstudio/core/os_lib_geometry_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/spec/openstudio/extension_spec.rb b/spec/openstudio/extension_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/spec/openstudio/runner_config_spec.rb b/spec/openstudio/runner_config_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/spec/openstudio/runner_spec.rb b/spec/openstudio/runner_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.