rubocop and old ruby

Author: eputnam

lib/puppet-strings/markdown/puppet_class.rb

@@ -2,9 +2,8 @@
 
 module PuppetStrings::Markdown
   class PuppetClass < Base
-    def initialize(registry:,
-                   template: 'puppet_resource.erb')
-      @template = template
+    def initialize(registry)
+      @template = 'puppet_resource.erb'
       super(registry, 'class')
     end
 

lib/puppet-strings/markdown/puppet_classes.rb

@@ -9,7 +9,7 @@ def self.in_classes
     def self.render
       final = "## Classes\n\n"
       in_classes.each do |klass|
-        final << PuppetStrings::Markdown::PuppetClass.new(registry: klass).render
+        final << PuppetStrings::Markdown::PuppetClass.new(klass).render
       end
       final
     end
@@ -18,7 +18,7 @@ def self.toc_info
       final = []
 
       in_classes.each do |klass|
-        final.push(PuppetStrings::Markdown::PuppetClass.new(registry: klass).toc_info)
+        final.push(PuppetStrings::Markdown::PuppetClass.new(klass).toc_info)
       end
 
       final

lib/puppet-strings/markdown/puppet_defined_type.rb

@@ -2,9 +2,8 @@
 
 module PuppetStrings::Markdown
   class PuppetDefinedType < Base
-    def initialize(registry:,
-                   template: 'puppet_resource.erb')
-      @template = template
+    def initialize(registry)
+      @template = 'puppet_resource.erb'
       super(registry, 'defined type')
     end
 

lib/puppet-strings/markdown/puppet_defined_types.rb

@@ -9,7 +9,7 @@ def self.in_dtypes
     def self.render
       final = "## Defined types\n\n"
       in_dtypes.each do |type|
-        final << PuppetStrings::Markdown::PuppetDefinedType.new(registry: type).render
+        final << PuppetStrings::Markdown::PuppetDefinedType.new(type).render
       end
       final
     end
@@ -18,7 +18,7 @@ def self.toc_info
       final = []
 
       in_dtypes.each do |type|
-        final.push(PuppetStrings::Markdown::PuppetDefinedType.new(registry: type).toc_info)
+        final.push(PuppetStrings::Markdown::PuppetDefinedType.new(type).toc_info)
       end
 
       final

lib/puppet-strings/markdown/puppet_function.rb

@@ -4,13 +4,12 @@ module PuppetStrings::Markdown
   class PuppetFunction < Base
     attr_reader :signatures
 
-    def initialize(registry:,
-                   template: 'puppet_function.erb')
-      @template = template
+    def initialize(registry)
+      @template = 'puppet_function.erb'
       super(registry, 'function')
       @signatures = []
       registry[:signatures].each do |sig|
-        @signatures.push(Signature.new(registry: sig))
+        @signatures.push(Signature.new(sig))
       end
     end
 
@@ -20,8 +19,9 @@ def render
   end
 
   class PuppetFunction::Signature < Base
-    def initialize(registry:)
-      super(registry, 'function signature')
+    def initialize(registry)
+      @registry = registry
+      super(@registry, 'function signature')
     end
 
     def signature

lib/puppet-strings/markdown/puppet_functions.rb

@@ -9,7 +9,7 @@ def self.in_functions
     def self.render
       final = "## Functions\n\n"
       in_functions.each do |func|
-        final << PuppetStrings::Markdown::PuppetFunction.new(registry: func).render
+        final << PuppetStrings::Markdown::PuppetFunction.new(func).render
       end
       final
     end
@@ -18,7 +18,7 @@ def self.toc_info
       final = []
 
       in_functions.each do |func|
-        final.push(PuppetStrings::Markdown::PuppetFunction.new(registry: func).toc_info)
+        final.push(PuppetStrings::Markdown::PuppetFunction.new(func).toc_info)
       end
 
       final

lib/puppet-strings/markdown/puppet_resource_type.rb

@@ -2,9 +2,8 @@
 
 module PuppetStrings::Markdown
   class PuppetResourceType < Base
-    def initialize(registry:,
-                   template: 'puppet_resource_type.erb')
-      @template = template
+    def initialize(registry)
+      @template = 'puppet_resource_type.erb'
       super(registry, 'resource type')
     end
 

lib/puppet-strings/markdown/puppet_resource_types.rb

@@ -9,7 +9,7 @@ def self.in_rtypes
     def self.render
       final = "## Resource types\n\n"
       in_rtypes.each do |type|
-        final << PuppetStrings::Markdown::PuppetResourceType.new(registry: type).render
+        final << PuppetStrings::Markdown::PuppetResourceType.new(type).render
       end
       final
     end
@@ -18,7 +18,7 @@ def self.toc_info
       final = []
 
       in_rtypes.each do |type|
-        final.push(PuppetStrings::Markdown::PuppetResourceType.new(registry: type).toc_info)
+        final.push(PuppetStrings::Markdown::PuppetResourceType.new(type).toc_info)
       end
 
       final

lib/puppet/face/strings.rb

@@ -101,13 +101,12 @@ def build_generate_options(options = nil, *yard_args)
       generate_options[:markup] = markup if markup
       generate_options[:path] = options[:out] if options[:out]
       generate_options[:stdout] = options[:stdout]
-      case options[:format].downcase
-      when 'markdown'
+      format = options[:format] || ""
+      if format.casecmp 'markdown'
         generate_options[:markdown] = true
-      when 'json'
+      elsif format.casecmp 'json'
         generate_options[:json] = true
-      else
-      end if options[:format]
+      end
       generate_options[:path] = nil if options[:stdout]
     end
     generate_options

spec/unit/puppet-strings/markdown/base_spec.rb

@@ -27,8 +27,7 @@ class klass(Integer $param1, $param2, String $param3 = hi) inherits foo::bar {
       'see',
       'since',
       'return_val',
-      'return_type',
-    ].each do |method|
+      'return_type',].each do |method|
       describe "##{method}" do
         it 'returns nil' do
           expect(component.method(method.to_sym).call).to be_nil
@@ -91,13 +90,11 @@ class klass::yeah(
       end
     end
 
-    [
-      'summary',
+    ['summary',
       'see',
       'since',
       'return_val',
-      'return_type',
-    ].each do |method|
+      'return_type'].each do |method|
       describe "##{method}" do
         it 'returns nil' do
           expect(component.method(method.to_sym).call).to be_nil