knife-spork 0.1.6 → 0.1.7

data/knife-spork.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'knife-spork'
-  s.version           = '0.1.6'
+  s.version           = '0.1.7'
   s.date              = '2012-02-21'
   s.rubyforge_project = 'knife-spork'
 

data/lib/chef/knife/spork-promote.rb

@@ -146,7 +146,7 @@ module KnifeSpork
 
               if config[:remote]
                 ui.msg "Uploading #{e} to server"
-                save_environment_changes_remote("#{e}.json")
+                save_environment_changes_remote("#{e}")
                 ui.info "\nPromotion complete, and environment uploaded."
               else
                 ui.info "\nPromotion complete! Please remember to upload your changed #{e}.json to the Chef Server."
@@ -198,7 +198,14 @@ module KnifeSpork
 
       def save_environment_changes_remote(environment)
           @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
-          updated = loader.load_from("environments", environment)
+          
+          cookbook_path = config[:cookbook_path]
+          if cookbook_path.size > 1
+              updated = loader.load_from("environments", "#{environment}.json")
+          else
+              path = cookbook_path[0].gsub("cookbooks","environments") + "/#{environment}.json"
+              updated = loader.object_from_file("#{path}")
+          end
           
           env_server = Chef::Environment.load(environment.gsub(".json","")).to_hash["cookbook_versions"]
           env_local = updated.to_hash["cookbook_versions"]

data/lib/knife-spork.rb

@@ -1,3 +1,3 @@
 module KnifeSpork
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jon Cowie