knife-spork 0.1.7 → 0.1.8

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.7'
+  s.version           = '0.1.8'
   s.date              = '2012-02-21'
   s.rubyforge_project = 'knife-spork'
 

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

@@ -117,11 +117,12 @@ module KnifeSpork
             @cookbook = @name_args[0]
         end
         
+        check_cookbook_uploaded(@cookbook)
+        
         environments.each do |e|
               ui.msg ""
               ui.msg "Environment: #{e}"
               
-              
               cookbook_path = config[:cookbook_path]
               if cookbook_path.size > 1
                 @environment = loader.load_from("environments", "#{e}.json")
@@ -129,7 +130,7 @@ module KnifeSpork
                 path = cookbook_path[0].gsub("cookbooks","environments") + "/#{e}.json"
                  @environment = loader.object_from_file("#{path}")
               end
-
+              
               if @cookbook == "all"
                 ui.msg "Promoting ALL cookbooks to environment #{@environment}"
                 cookbook_names = get_all_cookbooks
@@ -293,7 +294,7 @@ module KnifeSpork
         else
            @version = get_version(config[:cookbook_path], cookbook)
         end
-
+        
         ui.msg "Adding version constraint #{cookbook} = #{@version}"
         return update_version_constraints(environment,cookbook,@version)
       end
@@ -306,6 +307,24 @@ module KnifeSpork
           end
           return results
      end
+     
+    def check_cookbook_uploaded(cookbook)
+      if config[:version]
+            if !valid_version(config[:version])
+              ui.error("#{config[:version]} isn't a valid version number.")
+              return 1
+            else
+              @version = config[:version]
+            end
+        else
+           @version = get_version(config[:cookbook_path], cookbook)
+        end
+        ui.msg "Checking that #{cookbook} version #{@version} exists on the server before promoting (any error means it hasn't been uploaded yet)...\n\n"
+        env           = config[:environment]
+        api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook}/#{@version}" : "cookbooks/#{cookbook}/#{@version}"
+        cookbooks = rest.get_rest(api_endpoint)
+        ui.msg "#{cookbook} version #{@version } found on server!"
+    end
 
      def pretty_print(environment)
        return JSON.pretty_generate(JSON.parse(environment.to_json))

data/lib/knife-spork.rb

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

metadata

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