knife-cookbook-utils 0.1.0 → 0.2.0

data/lib/chef/knife/cookbook-keep.rb

@@ -1,8 +1,8 @@
-require 'rlet'
+require 'knife-cookbook-utils/rlet'
 
 module KnifeCookbookUtils
   class CookbookKeep < Chef::Knife
-    include Let
+    include KnifeCookbookUtils::Let
 
     banner "knife cookbook keep NUM (options)"
 

data/lib/chef/knife/cookbook-missing-deps.rb

@@ -1,9 +1,8 @@
-require 'rlet'
-require 'ap'
+require 'knife-cookbook-utils/rlet'
 
 module KnifeCookbookUtils
   class CookbookMissingDeps < Chef::Knife
-    include Let
+    include KnifeCookbookUtils::Let
 
     banner "knife cookbook missing deps (options)"
 
@@ -14,7 +13,7 @@ module KnifeCookbookUtils
     # A map of all cookbooks and versions
     let(:all_cookbooks) do
       Hash.new.tap do |cookbooks|
-        rest.get("cookbooks/?num_versions=all").each do |cookbook, info|
+        raw_cookbook_listing.each do |cookbook, info|
           info['versions'].each do |version_info|
             # We cannot use Hash.new to initialize a new hash, since it will try to
             # add a new key while iterating
@@ -30,8 +29,7 @@ module KnifeCookbookUtils
         all_cookbooks.each do |cookbook_name, versions|
           versions.each do |cookbook_version, cookbook_url|
             Chef::Log.info("Checking deps for #{cookbook_name} #{cookbook_version}")
-            cookbook = rest.get("cookbooks/#{cookbook_name}/#{cookbook_version}")
-            cookbook.manifest['metadata']['dependencies'].each do |dep_cookbook_name, dep_constraint|
+            dependencies_for_cookbook_version(cookbook_name, cookbook_version).each do |dep_cookbook_name, dep_constraint|
               _constraint = Chef::VersionConstraint.new(dep_constraint)
               available_versions = (all_cookbooks[dep_cookbook_name] || {}).keys.flatten
               next if available_versions.any? { |c| _constraint.include?(c) }
@@ -44,6 +42,15 @@ module KnifeCookbookUtils
       end
     end
 
+    let(:raw_cookbook_listing) { rest.get("cookbooks/?num_versions=all") }
+
+    def dependencies_for_cookbook_version(name, version)
+      rest.
+        get("cookbooks/#{name}/#{version}").
+        manifest['metadata']['dependencies']
+    end
+
+
     def run
       puts "Missing dependencies:" if missing_deps.any?
       missing_deps.each do |cookbook, missing_deps|

data/lib/knife-cookbook-utils/rlet.rb

@@ -0,0 +1,71 @@
+
+# Author's Note: I was asked to embed this. Since this is not entirely my project, I agreed.
+# My preference is to have this in a gem (or better yet, in the standard library). See: rlet gem
+
+module KnifeCookbookUtils
+  # This is ActiveSupport::Concern, taken from
+  # https://github.com/rails/rails/blob/6794e92b204572d75a07bd6413bdae6ae22d5a82/activesupport/lib/active_support/concern.rb
+  #
+  # If ActiveSupport::Concern is loaded, it will use that instead
+  #
+  # Rails license:
+  #   https://github.com/rails/rails/blob/6794e92b204572d75a07bd6413bdae6ae22d5a82/activesupport/MIT-LICENSE
+  module RLet
+    module Concern
+      def self.extended(base) #:nodoc:
+        base.instance_variable_set("@_dependencies", [])
+      end
+
+      def append_features(base)
+        if base.instance_variable_defined?("@_dependencies")
+          base.instance_variable_get("@_dependencies") << self
+          return false
+        else
+          return false if base < self
+          @_dependencies.each { |dep| base.send(:include, dep) }
+          super
+          base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+          base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+        end
+      end
+
+      def included(base = nil, &block)
+        if base.nil?
+          @_included_block = block
+        else
+          super
+        end
+      end
+    end
+  end
+
+  Concern = if defined?(ActiveSupport) and defined?(ActiveSupport::Concern)
+              ActiveSupport::Concern
+            else
+              RLet::Concern
+            end
+
+  module Let
+    extend Concern
+
+    module ClassMethods
+      def let(name, &block)
+        define_method(name) do
+          __memoized[name] ||= instance_eval(&block)
+        end
+      end
+    end
+
+    # Implementation based on Rspec let()
+    #   https://github.com/rspec/rspec-core/blob/07be957b7f69447bf59ffe3ede9530436e6267ee/lib/rspec/core/let.rb
+    # License of RSpec:
+    #   https://github.com/rspec/rspec-core/blob/07be957b7f69447bf59ffe3ede9530436e6267ee/License.txt
+
+    private
+
+    def __memoized # :nodoc:
+      @__memoized ||= {}
+    end
+  end
+end
+

data/lib/knife-cookbook-utils/version.rb

@@ -1,3 +1,3 @@
 module KnifeCookbookUtils
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/chef/knife/cookbook-keep_spec.rb

@@ -0,0 +1,205 @@
+require 'spec_helper'
+require 'chef/knife/cookbook-keep'
+
+describe KnifeCookbookUtils::CookbookKeep do
+
+  let(:command) do
+    KnifeCookbookUtils::CookbookKeep.new.
+      tap(&with_cookbook_listing).
+      tap(&with_num_to_keep)
+  end
+
+  let(:with_num_to_keep)      { with_stub.(:num_to_keep, num_to_keep) }
+  let(:with_cookbook_listing) { with_stub.(:raw_cookbook_listing, raw_cookbook_listing) }
+  let(:with_stub)             { ->(stub_name, returns) { ->(x) { x.stub!(stub_name).and_return(returns) } } }
+  let(:version)               { ->(v) { Chef::Version.new(v) } }
+
+  let(:num_to_keep) { 1 }
+  let(:raw_cookbook_listing) { fail 'Must define let(:raw_cookbook_listing' }
+  let(:cookbooks_with_one_version) do
+    {
+      "rbenv"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[{"version"=>"1.4.1", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.1"}]},
+      "postgresql"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql",
+        "versions"=>[{"version"=>"3.0.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql/3.0.0"}]},
+    }
+  end
+
+  let(:cookbooks_with_two_versions) do
+    {
+      "rbenv"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[
+          {"version"=>"1.4.1", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.1"},
+          {"version"=>"1.4.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.0"},
+       ]},
+      "postgresql"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql",
+        "versions"=>[{"version"=>"3.0.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql/3.0.0"}]},
+    }
+  end
+
+  let(:cookbooks_with_three_versions) do
+    {
+      "nginx"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[
+          {"version"=>"1.7.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.7.0"},
+          {"version"=>"1.6.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.6.0"},
+          {"version"=>"1.4.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.0"},
+       ]},
+      "rbenv"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[
+          {"version"=>"1.4.1", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.1"},
+          {"version"=>"1.4.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.0"},
+       ]},
+      "postgresql"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql",
+        "versions"=>[{"version"=>"3.0.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql/3.0.0"}]},
+    }
+  end
+
+  describe "#cookbooks_to_keep" do
+    subject { command.cookbooks_to_keep }
+
+    context "with only one cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_one_version }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should only keep latest version" do
+          should eql [ ['rbenv', version.('1.4.1')], ['postgresql', version.('3.0.0')] ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should only keep latest version" do
+          should eql [ ['rbenv', version.('1.4.1')], ['postgresql', version.('3.0.0')] ]
+        end
+      end
+    end
+
+    context "with only two cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_two_versions }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should only keep latest version" do
+          should eql [ ['rbenv', version.('1.4.1')], ['postgresql', version.('3.0.0')] ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should only keep latest 2 versions" do
+          should eql [ ['rbenv', version.('1.4.1')], ['rbenv', version.('1.4.0')], ['postgresql', version.('3.0.0')] ]
+        end
+      end
+    end
+
+    context "with only three cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_three_versions }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should only keep latest version" do
+          should eql [ ['nginx', version.('1.7.0') ], ['rbenv', version.('1.4.1')], ['postgresql', version.('3.0.0')] ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should only keep latest 2 versions" do
+          should eql [
+            ['nginx', version.('1.7.0')],
+            ['nginx', version.('1.6.0')],
+            ['rbenv', version.('1.4.1')],
+            ['rbenv', version.('1.4.0')],
+            ['postgresql', version.('3.0.0')] ]
+        end
+      end
+
+      context "when keeping latest 3 versions" do
+        let(:num_to_keep) { 3 }
+        it "should only keep latest 3 versions" do
+          should eql [
+            ['nginx', version.('1.7.0')],
+            ['nginx', version.('1.6.0')],
+            ['nginx', version.('1.4.0')],
+            ['rbenv', version.('1.4.1')],
+            ['rbenv', version.('1.4.0')],
+            ['postgresql', version.('3.0.0')] ]
+        end
+      end
+    end # with only three cookbook versions
+  end # #cookbooks_to_keep
+
+  describe "#cookbooks_to_delete" do
+    subject { command.cookbooks_to_delete }
+
+    context "with only one cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_one_version }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should delete nothing" do
+          should eql [ ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should delete nothing" do
+          should eql [ ]
+        end
+      end
+    end
+
+    context "with only two cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_two_versions }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should delete older versions" do
+          should eql [ ['rbenv', version.('1.4.0')] ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should delete nothing" do
+          should eql [ ]
+        end
+      end
+    end
+
+    context "with only three cookbook version" do
+      let(:raw_cookbook_listing) { cookbooks_with_three_versions }
+
+      context "when keeping latest version" do
+        let(:num_to_keep) { 1 }
+        it "should delete older versions" do
+          should eql [ ['nginx', version.('1.6.0') ], ['nginx', version.('1.4.0')], ['rbenv', version.('1.4.0')] ]
+        end
+      end
+
+      context "when keeping latest 2 versions" do
+        let(:num_to_keep) { 2 }
+        it "should older versions" do
+          should eql [ ['nginx', version.('1.4.0')] ]
+        end
+      end
+
+      context "when keeping latest 3 versions" do
+        let(:num_to_keep) { 3 }
+        it "should delete nothing" do
+          should eql [ ]
+        end
+      end
+    end # with only three cookbook versions
+  end # #cookbooks_to_delete
+end

data/spec/chef/knife/cookbook-missing-deps_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+require 'chef/knife/cookbook-missing-deps'
+
+describe KnifeCookbookUtils::CookbookMissingDeps do
+
+  let(:command) do
+    KnifeCookbookUtils::CookbookMissingDeps.new.
+      tap(&with_cookbook_listing).
+      tap(&with_dependency_check)
+  end
+
+  let(:with_cookbook_listing) { with_stub.(:raw_cookbook_listing, raw_cookbook_listing) }
+  let(:with_dependency_check) { ->(x) { x.stub(:dependencies_for_cookbook_version, &dependencies_for_cookbook_version)} }
+  let(:with_stub)             { ->(stub_name, returns) { ->(x) { x.stub!(stub_name).and_return(returns) } } }
+
+  let(:dependencies_for_cookbook_version) { ->(name, version) { {} } }
+
+  let(:raw_cookbook_listing) do
+    {
+      "nginx"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[
+          {"version"=>"1.7.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.7.0"},
+          {"version"=>"1.6.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.6.0"},
+          {"version"=>"1.4.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.4.0"},
+       ]},
+      "rbenv"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv",
+        "versions"=>[
+          {"version"=>"1.4.1", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.1"},
+          {"version"=>"1.4.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.0"},
+       ]},
+      "postgresql"=>{
+        "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql",
+        "versions"=>[{"version"=>"3.0.0", "url"=>"https://api.opscode.com/organizations/example-org/cookbooks/postgresql/3.0.0"}]},
+    }
+  end
+
+  describe "#all_cookbooks" do
+    subject { command.all_cookbooks }
+    let(:expected) do
+      {
+        "nginx" => {
+          "1.7.0" => "https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.7.0",
+          "1.6.0" => "https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.6.0",
+          "1.4.0" => "https://api.opscode.com/organizations/example-org/cookbooks/nginx/1.4.0", },
+        "rbenv" => {
+          "1.4.1" => "https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.1",
+          "1.4.0" => "https://api.opscode.com/organizations/example-org/cookbooks/rbenv/1.4.0" },
+        "postgresql" => {
+          "3.0.0" => "https://api.opscode.com/organizations/example-org/cookbooks/postgresql/3.0.0" }
+      }
+    end
+
+    it "should return a map of all cookbook and versions" do
+      should eql expected
+    end
+  end
+
+  describe "#missing_deps" do
+    subject { command.missing_deps }
+
+    context "without missing deps" do
+      it { should eql Hash.new }
+    end
+
+    context "with missing deps" do
+      let(:dependencies_for_cookbook_version) do
+        proc do |name, version|
+          if name == 'rbenv' and version == '1.4.1'
+            { 'ohai' => '>= 1.1' }
+          else
+            { }
+          end
+        end
+      end
+
+      let(:expected) { { ['rbenv', '1.4.1'] => [['ohai', '>= 1.1']] } }
+
+      it "should return a map of missing deps" do
+        should eql expected
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'chef/knife'
+
+# variable_to_watch.tap(&WATCH)
+WATCH = lambda { |o| ap o } unless defined?(WATCH)
+
+# Autoload everything in support
+Dir["spec/support/**/*.rb"].map { |f| f.gsub(%r{.rb$}, '') }.each { |f| require f }
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cookbook-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 11.0.0
-- !ruby/object:Gem::Dependency
-  name: rlet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +56,11 @@ files:
 - Rakefile
 - lib/chef/knife/cookbook-keep.rb
 - lib/chef/knife/cookbook-missing-deps.rb
+- lib/knife-cookbook-utils/rlet.rb
 - lib/knife-cookbook-utils/version.rb
+- spec/chef/knife/cookbook-keep_spec.rb
+- spec/chef/knife/cookbook-missing-deps_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.opscode.com
 licenses:
 - Apache 2.0