spiceweasel 2.1.0 → 2.1.2

data/lib/spiceweasel/cli.rb

@@ -208,11 +208,11 @@ module Spiceweasel
       ARGV << "-h" if ARGV.empty?
       begin
         parse_options
-        if Spiceweasel::Config[:knifeconfig]
-          Spiceweasel::Config[:knife_options] = "-c #{Spiceweasel::Config[:knifeconfig]} "
+        if @config[:knifeconfig]
+          Spiceweasel::Config[:knife_options] = " -c #{@config[:knifeconfig]} "
         end
-        if Spiceweasel::Config[:serverurl]
-          Spiceweasel::Config[:knife_options] += "--server-url #{Spiceweasel::Config[:serverurl]} "
+        if @config[:serverurl]
+          Spiceweasel::Config[:knife_options] += "--server-url #{@config[:serverurl]} "
         end
       rescue OptionParser::InvalidOption => e
         STDERR.puts e.message

data/lib/spiceweasel/environments.rb

@@ -57,14 +57,19 @@ module Spiceweasel
     def validate(environment, cookbooks)
       file = %W(environments/#{environment}.rb environments/#{environment}.json).detect{|f| File.exists?(f)}
       if file
-        if (Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
-          env = Chef::Environment.new(false)
-        else
-          env = Chef::Environment.new
+        case file
+        when /\.json$/
+          env = Chef::JSONCompat.from_json(IO.read(file))
+        when /\.rb$/
+          if (Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
+            env = Chef::Environment.new(false)
+          else
+            env = Chef::Environment.new
+          end
+          env.from_file(file)
         end
-        env.from_file(file)
         if(env.name != environment)
-          STDERR.puts "ERROR: Environment '#{environment}' listed in the manifest does not match the name '#{name}' within the environments/#{environment}.rb file."
+          STDERR.puts "ERROR: Environment '#{environment}' listed in the manifest does not match the name '#{env.name}' within the #{file} file."
           exit(-1)
         end
         env.cookbook_versions.keys.each do |dep|

data/lib/spiceweasel/extract_local.rb

@@ -32,7 +32,8 @@ module Spiceweasel
       end
 
       # COOKBOOKS
-      cookbooks = self.resolve_cookbooks(berksfile.cookbook_list)
+      cookbooks = berksfile ? self.resolve_cookbooks(berksfile.cookbook_list) : self.resolve_cookbooks
+
       objects['cookbooks'] = cookbooks unless cookbooks.empty?
 
       # ROLES

data/lib/spiceweasel/roles.rb

@@ -59,15 +59,20 @@ module Spiceweasel
       #validate the role passed in match the name of either the .rb or .json
       file = %W(roles/#{role}.rb roles/#{role}.json).detect{|f| File.exists?(f)}
       if(file)
-        if(Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
-          c_role = Chef::Role.new(true)
-        else
-          c_role = Chef::Role.new
+        case file
+        when /\.json$/
+          c_role = Chef::JSONCompat.from_json(IO.read(file))
+        when /\.rb$/
+          if(Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
+            c_role = Chef::Role.new(true)
+          else
+            c_role = Chef::Role.new
+          end
+          c_role.from_file(file)
         end
-        c_role.from_file(file)
         Spiceweasel::Log.debug("role: '#{role}' name: '#{c_role.name}'")
         if !role.eql?(c_role.name)
-          STDERR.puts "ERROR: Role '#{role}' listed in the manifest does not match the name '#{c_role.name}' within the roles/#{role}.rb file."
+          STDERR.puts "ERROR: Role '#{role}' listed in the manifest does not match the name '#{c_role.name}' within the #{file} file."
           exit(-1)
         end
         c_role.run_list.each do |runlist_item|

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json