diff --git a/Gemfile b/Gemfile index b1500df..6825907 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,9 @@ gem 'rgen' gem 'redcarpet' gem 'puppet-strings', '0.1.0', :path => '.' -if puppetversion = ENV['PUPPET_VERSION'] +puppetversion = ENV['PUPPET_VERSION'] + +if puppetversion gem 'puppet', puppetversion else gem 'puppet', '~> 3.6.2' diff --git a/lib/puppet/face/strings.rb b/lib/puppet/face/strings.rb index 200ff35..4b24bee 100644 --- a/lib/puppet/face/strings.rb +++ b/lib/puppet/face/strings.rb @@ -38,12 +38,14 @@ Puppet::Face.define(:strings, '0.0.1') do yardoc_actions = Puppetx::PuppetLabs::Strings::Actions.new(Puppet[:debug], Puppet[:trace]) # The last element of the argument array should be the options hash. + # We don't have any options yet, so for now just pop the hash off and + # toss it. # # NOTE: The Puppet Face will throw 'unrecognized option' errors if any # YARD options are passed to it. The best way to approach this problem is # by using the `.yardopts` file. YARD will autoload any options placed in # that file. - opts = args.pop + args.pop # For now, assume the remaining positional args are a list of manifest # and ruby files to parse. @@ -67,7 +69,7 @@ Puppet::Face.define(:strings, '0.0.1') do server_actions = Puppetx::PuppetLabs::Strings::Actions.new(Puppet[:debug], Puppet[:trace]) - opts = args.pop + args.pop module_names = args diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 52f5d83..5b230d3 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -6,8 +6,6 @@ unless ENV['RS_PROVISION'] == 'no' end RSpec.configure do |c| - # Project root - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) # Readable test descriptions c.formatter = :documentation