knife-pantry 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a95cf4479bfbc01387b2e34e1d7045d893bde6d
-  data.tar.gz: 1e1a6e1bf995f6a2a67314e878b51c303fcd3622
+  metadata.gz: 48adb3a70f9ab7f7f4c8eb1d2f87a91151fa2ecf
+  data.tar.gz: 35d6d97cd772adf1624b1c3990c2c4a44c0d18f7
 SHA512:
-  metadata.gz: e7feb6757b1c978bc2ec588e0f35e9a60ae0c75f9ba33a80a2fe60dda371e4a2a312a17da85c76d88bb2ab2ccbbd77a1e8918af5b3d3630abc45aa1e8bd1e98d
-  data.tar.gz: 28e35551e4031911962a593e8f3846d35bd59ae4f2eab926f0bbce9647e37184230bcaafa3dd33657d0d57a6d1da153f747e660c9300a37f10fa5cb688152a85
+  metadata.gz: 19308121589032e63db6e17947bca7f5b7859a4a8c117f8722ded187820fcb2f881596d7460191be57c12c22312de0fc6f5b246decbc4856cbabb8bb3bdb7457
+  data.tar.gz: 7e904540264b2c6300bd39f4f7c0e8cd06e9ff9f05935d2466af6a6862fc46f22a1ccce71683df096fcc22a4ec732b6b698ea74c9f98e2c77778bbf50d8e6476

data/README.md

@@ -1,4 +1,4 @@
-# Knife::Pantry
+# knife-pantry
 
 Knife plugin that allows you to manage environment specific cookbook versioning.
 
@@ -37,11 +37,13 @@ knife pantry lookup <cookbook-name> <chef-environment>
 
 #### set 
 Set allows you to, well... set a version for the specified cookbook in a particular environment, or environments. 
-A comma seperated list of environments can be passed in to set a version across multiple at once.
+A comma seperated list of environments can be passed in to set a version across multiple at once. If your goal
+is to upgrade to the newest version of a particular cookbook, you can pass in 'latest' instead of specifying 
+a version.
 ```
 knife pantry set <cookbook-name> <version> <environments>
-[Action Complete!]    development => 0.2.5 => esfeeder
-[Action Complete!]    uat => 0.2.5 => esfeeder
+[Action Complete!]    development => 0.2.5 => my_cookbook
+[Action Complete!]    uat => 0.2.5 => my_cookbook
 ```
 
 ## Contributing

data/lib/chef/knife/lookup.rb

@@ -1,53 +1,54 @@
 require 'chef/knife'
 require 'json'
 
+module Pantry
+  class PantryLookup < Chef::Knife
 
-class PantryLookup < Chef::Knife
+    banner "knife pantry lookup COOKBOOK ENVIRONMENT (options)"
 
-  banner "knife pantry lookup COOKBOOK ENVIRONMENT (options)"
+    def run
+      cbk = name_args.first
+      env = name_args.last
 
-  def run
-    cbk = name_args.first
-    env = name_args.last
-
-    get_env(env)
-    version = get_cbk_versions(env, cbk)
-    get_past_versions(cbk, version)
-  end
-
-  def get_env(env)
-    environments = []
-    for key in rest.get_rest('environments')
-      environments.push(key[0])
+      get_env(env)
+      version = get_cbk_versions(env, cbk)
+      get_past_versions(cbk, version)
     end
-    if !(environments.include?(env))
-      puts "Specified environment does not exist"
-    else
-      puts "[Environment found!]   Looking for cookbook..."
-    end
-  end
 
-  def get_cbk_versions(env, cbk)
-    cookbooks = rest.get_rest("environments/#{env}/cookbooks")
-    if !(cookbooks.has_key?(cbk))
-      puts "#{cbk} not found in #{env}"
-    else
-      puts "[Cookbook found!]    Checking current version..."
-      version = cookbooks[cbk]['versions'][0]['version']
-      puts "[Version found!]    Finding latest releases..."
+    def get_env(env)
+      environments = []
+      for key in rest.get_rest('environments')
+        environments.push(key[0])
+      end
+      if !(environments.include?(env))
+        puts "Specified environment does not exist"
+      else
+        puts "[Environment found!]   Looking for cookbook..."
+      end
     end
-    return version
-  end
 
-  def get_past_versions(cbk, version)
-    available_versions= rest.get_rest("cookbooks/#{cbk}")
-    puts "[Releases found!]"
-    available_versions[cbk]['versions'][0..4].each { |release|
-      if release['version'] == version
-        puts release['version'] + "  <== Current version"
+    def get_cbk_versions(env, cbk)
+      cookbooks = rest.get_rest("environments/#{env}/cookbooks")
+      if !(cookbooks.has_key?(cbk))
+        puts "#{cbk} not found in #{env}"
       else
-        puts release['version']
+        puts "[Cookbook found!]    Checking current version..."
+        version = cookbooks[cbk]['versions'][0]['version']
+        puts "[Version found!]    Finding latest releases..."
       end
-    }
+      return version
+    end
+
+    def get_past_versions(cbk, version)
+      available_versions= rest.get_rest("cookbooks/#{cbk}")
+      puts "[Releases found!]"
+      available_versions[cbk]['versions'][0..4].each { |release|
+        if release['version'] == version
+          puts release['version'] + "  <== Current version"
+        else
+          puts release['version']
+        end
+      }
+    end
   end
 end

data/lib/chef/knife/set.rb

@@ -1,58 +1,59 @@
 require 'chef/knife'
 require 'json'
 
+module Pantry
+  class PantrySet < Chef::Knife
 
-class PantrySet < Chef::Knife
+    banner "knife pantry set COOKBOOK VERSION [ENVIRONMENT] (options)"
 
-  banner "knife pantry set COOKBOOK VERSION [ENVIRONMENT] (options)"
+    def run
+      options = {
+        cbk: name_args.first, 
+        ver: name_args[1], 
+        env: name_args.last
+      }
 
-  def run
-    options = {
-      cbk: name_args.first, 
-      ver: name_args[1], 
-      env: name_args.last
-    }
+      if options[:ver] == 'latest' 
+        available_versions = rest.get_rest("cookbooks/#{options[:cbk]}")
+        options[:ver] = available_versions[options[:cbk]]['versions'][0]['version']
+      end
 
-    if options[:ver] == 'latest' 
-      available_versions = rest.get_rest("cookbooks/#{options[:cbk]}")
-      options[:ver] = available_versions[options[:cbk]]['versions'][0]['version']
+      options[:env] = options[:env].split(',')
+      options[:env].each {|x| 
+        options[:current_env] = x
+        if set(get_cbk_list(options))
+          puts "[Action Complete!]    #{options[:current_env]} => #{options[:ver]} => #{options[:cbk]}"
+        else
+          puts "[No Action!]    #{options[:current_env]} already using #{options[:cbk]} #{options[:ver]}"
+        end
+      }
     end
 
-    options[:env] = options[:env].split(',')
-    options[:env].each {|x| 
-      options[:current_env] = x
-      if set(get_cbk_list(options))
-        puts "[Action Complete!]    #{options[:current_env]} => #{options[:ver]} => #{options[:cbk]}"
-      else
-        puts "[No Action!]    #{options[:current_env]} already using #{options[:cbk]} #{options[:ver]}"
+    def get_cbk_list(options)
+      chef_env =  rest.get_rest("environments/#{options[:current_env]}")
+      env_json = JSON.parse(chef_env.to_json(chef_env))
+      cbk_list = env_json['cookbook_versions']
+
+      if cbk_list.has_key?(options[:cbk])
+        if cbk_list[options[:cbk]] == "= " + options[:ver]
+          return nil
+        else
+          cbk_list[options[:cbk]] = "= " + options[:ver]
+        end
       end
-    }
-  end
 
-  def get_cbk_list(options)
-    chef_env =  rest.get_rest("environments/#{options[:current_env]}")
-    env_json = JSON.parse(chef_env.to_json(chef_env))
-    cbk_list = env_json['cookbook_versions']
+      new_cbk_list = cbk_list
+      env_json['cookbook_versions'] = new_cbk_list
+      return env_json
+    end
 
-    if cbk_list.has_key?(options[:cbk])
-      if cbk_list[options[:cbk]] == "= " + options[:ver]
-        return nil
+    def set(env_json)
+      if env_json != nil
+        rest.put_rest("environments/" + env_json['name'], env_json)
+        return true    
       else
-        cbk_list[options[:cbk]] = "= " + options[:ver]
+        return false
       end
     end
-
-    new_cbk_list = cbk_list
-    env_json['cookbook_versions'] = new_cbk_list
-    return env_json
-  end
-
-  def set(env_json)
-    if env_json != nil
-      rest.put_rest("environments/" + env_json['name'], env_json)
-      return true    
-    else
-      return false
-    end
   end
 end

data/lib/knife-pantry/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Pantry
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-pantry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef