knife_cookbook_dependencies 0.0.1 → 0.0.2

data/Guardfile

@@ -0,0 +1,11 @@
+guard 'spork' do
+  watch('Gemfile')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch(%r{^spec/support/}) { :rspec }
+end
+
+guard 'rspec', :version => 2, :cli => "--color --drb --format Fuubar", :all_on_start => false, :all_after_pass => false do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/tryhard/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')       { "spec" }
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Josiah Kiehl
+Copyright (c) 2012 Riot Games
 
 MIT License
 

data/README.rdoc

@@ -1,5 +1,30 @@
-= Remy, cookbook manager
+= Knife Cookbook Dependencies
 
-Gusteau:: What do I always say? Anyone can cook.   
-Remy:: Yeah. Anyone can, that doesn't mean that anyone should.  
-Gusteau:: Well, that is not stopping him. See?
+= Running tests
+
+=== Install prerequisites
+
+Install the latest version of {Bundler}[http://gembundler.com]
+
+    $ gem install bundler
+
+Clone the project
+
+    $ git clone git://github.com/RiotGames/knife_cookbook_dependencies.git
+
+and run:
+
+    $ cd knife_cookbook_dependencies
+    $ bundle install
+
+Bundler will install all gems and their dependencies required for testing and developing. 
+
+=== Running RSpec tests
+
+    $ bundle exec guard start
+
+= Authors and Contributors
+
+* Josiah Kiehl (<josiah@skirmisher.net>)
+* Jamie Winsor (<jamie@vialstudios.com>)
+* Erik Hollensbe (<erik@hollensbe.org>)

data/knife_cookbook_dependencies.gemspec

@@ -1,30 +1,33 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/knife_cookbook_dependencies/version', __FILE__)
 
-Gem::Specification.new do |gem|
-
+Gem::Specification.new do |s|
   # TODO FIXME need to modify all of these
-
-  gem.authors       = ["Josiah Kiehl"]
-  gem.email         = ["josiah@skirmisher.net"]
-  gem.description   = %q{Resolves cookbook dependencies}
-  gem.summary       = gem.description
-  gem.homepage      = "http://github.com/RiotGames/knife_cookbook_dependencies"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "knife_cookbook_dependencies"
-  gem.require_paths = ["lib"]
-  gem.version       = KnifeCookbookDependencies::VERSION
+  s.authors       = ["Josiah Kiehl", "Jamie Winsor", "Erik Hollensbe"]
+  s.email         = ["josiah@skirmisher.net", "jamie@vialstudios.com", "erik@hollensbe.org"]
+  s.description   = %q{Resolves cookbook dependencies}
+  s.summary       = s.description
+  s.homepage      = "https://github.com/RiotGames/knife_cookbook_dependencies"
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.name          = "knife_cookbook_dependencies"
+  s.require_paths = ["lib"]
+  s.version       = KnifeCookbookDependencies::VERSION
   
   # FIXME will want to adjust this later
-  gem.add_runtime_dependency 'dep_selector',    '>= 0' 
-  gem.add_runtime_dependency 'chef',            '~> 0.10.0'
-  gem.add_runtime_dependency 'minitar',         '>= 0'
+  s.add_runtime_dependency 'dep_selector'
+  s.add_runtime_dependency 'chef',            '~> 0.10.0'
+  s.add_runtime_dependency 'minitar'
 
-  gem.add_development_dependency 'rake',        '~> 0.9.0'
-  gem.add_development_dependency 'rspec',       '>= 0'
-  gem.add_development_dependency 'rdoc',        '~> 3.0'
-  gem.add_development_dependency 'simplecov',   '>= 0'
+  s.add_development_dependency 'aruba'
+  s.add_development_dependency 'rake',        '~> 0.9.0'
+  s.add_development_dependency 'rdoc',        '~> 3.0'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'fuubar'
+  s.add_development_dependency 'spork'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'guard-spork'
 end

data/lib/knife_cookbook_dependencies.rb

@@ -12,12 +12,15 @@ require 'knife_cookbook_dependencies/dependency_reader'
 require 'knife_cookbook_dependencies/dsl'
 require 'knife_cookbook_dependencies/cookbookfile'
 require 'knife_cookbook_dependencies/git'
+require 'knife_cookbook_dependencies/error_messages'
 
 module KnifeCookbookDependencies
   DEFAULT_FILENAME = 'Cookbookfile'
   COOKBOOKS_DIRECTORY = 'cookbooks'
 
   class << self
+    attr_accessor :ui
+
     def shelf
       @shelf ||= KnifeCookbookDependencies::Shelf.new
     end
@@ -26,10 +29,6 @@ module KnifeCookbookDependencies
       @shelf = nil
     end
 
-    def ui=(ui)
-      @ui = ui
-    end
-
     def ui
       @ui ||= Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
     end

data/lib/knife_cookbook_dependencies/cookbook.rb

@@ -46,7 +46,9 @@ module KnifeCookbookDependencies
         return
       else
         csd = Chef::Knife::CookbookSiteDownload.new([name, latest_constrained_version.to_s, "--file", download_filename])
-        output = KnifeCookbookDependencies::KnifeUtils.capture_knife_output(csd)
+        self.class.rescue_404 do
+          output = KnifeCookbookDependencies::KnifeUtils.capture_knife_output(csd)
+        end
 
         if show_output
           puts output
@@ -118,7 +120,9 @@ module KnifeCookbookDependencies
 
     def cookbook_data
       css = Chef::Knife::CookbookSiteShow.new([@name])
-      @cookbook_data ||= JSON.parse(KnifeCookbookDependencies::KnifeUtils.capture_knife_output(css))
+      self.class.rescue_404 do
+        @cookbook_data ||= JSON.parse(KnifeCookbookDependencies::KnifeUtils.capture_knife_output(css))
+      end
     end
 
     def download_filename
@@ -180,5 +184,17 @@ module KnifeCookbookDependencies
     def == other
       other.name == @name and other.version_constraints == @version_constraints
     end
+
+    class << self
+      def rescue_404
+        begin
+          yield
+        rescue Net::HTTPServerException => e
+          KnifeCookbookDependencies.ui.fatal ErrorMessages.missing_cookbook(@name) if e.message.match(/404/)
+          exit 100
+        end
+      end
+    end
+
   end
 end

data/lib/knife_cookbook_dependencies/cookbookfile.rb

@@ -22,8 +22,13 @@ module KnifeCookbookDependencies
         else
           filename = KnifeCookbookDependencies::DEFAULT_FILENAME unless File.exist?(filename)
         end
-          
-        read File.open(filename).read
+
+        begin
+          read File.open(filename).read
+        rescue Errno::ENOENT => e
+          KnifeCookbookDependencies.ui.fatal ErrorMessages.missing_cookbookfile
+          exit 100
+        end
         KnifeCookbookDependencies.shelf.resolve_dependencies
         KnifeCookbookDependencies.shelf.populate_cookbooks_directory
         KnifeCookbookDependencies.shelf.write_lockfile unless lockfile

data/lib/knife_cookbook_dependencies/error_messages.rb

@@ -0,0 +1,13 @@
+module KnifeCookbookDependencies
+  module ErrorMessages
+    class << self
+      def missing_cookbook name
+        "The cookbook #{name} was not found on the Opscode Community site. Provide a git or path key for #{name} if it is unpublished."
+      end
+
+      def missing_cookbookfile
+        "There is no Cookbookfile in #{Dir.pwd}."
+      end
+    end
+  end
+end

data/lib/knife_cookbook_dependencies/version.rb

@@ -1,3 +1,3 @@
 module KnifeCookbookDependencies
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/acceptance/knife_cookbook_dependencies_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'chef/knife/cookbook_dependencies_install'
+require 'aruba/api'
+
+
+describe "knife cookbook dependencies install" do
+  describe "should print a friendly error message" do
+    include Aruba::Api
+
+    it "for missing cookbooks" do
+      pending "Knife commands produce no output when run with aruba. I'm not sure why." # TODO FIXME
+
+      cookbook_name = 'thisisamissingcookbook'
+      with_cookbookfile %Q[cookbook "#{cookbook_name}"] do
+        cmd = 'cat nofile' #'knife cookbook dependencies install'
+        process = run(cmd)
+        process.output(true).should match(/#{KnifeCookbookDependencies::ErrorMessages.missing_cookbook(cookbook_name)}/)
+      end
+    end
+    it "for missing Cookbookfile"
+  end
+end

data/spec/lib/knife_cookbook_dependencies/cookbook_spec.rb

@@ -8,8 +8,7 @@ module KnifeCookbookDependencies
       subject.clean
     end
 
-    describe  do
-
+    describe do
       before do
         Cookbook.any_instance.stub(:versions).and_return ['0.1.1', '0.9.0', '1.0.0', '1.1.8'].collect {|v| Gem::Version.new(v) }
       end
@@ -40,7 +39,6 @@ module KnifeCookbookDependencies
           File.exists?(File.join(KnifeCookbookDependencies::COOKBOOKS_DIRECTORY, example_cookbook_from_path.name)).should be_true
         end
       end
-      
     end
 
     describe "#versions" do
@@ -51,15 +49,14 @@ module KnifeCookbookDependencies
 
     describe '#version_from_metadata_file' do
       it "should be able to handle single quoted strings" do
-        Cookbook.any_instance.stub(:metadata_file).and_return <<M
-version '1.2.3'
-M
+        Cookbook.any_instance.stub(:metadata_file).and_return(%Q{version '1.2.3'})
+
         subject.version_from_metadata_file.should == DepSelector::Version.new('1.2.3')
       end
+
       it "should be able to handle double quoted strings" do
-        Cookbook.any_instance.stub(:metadata_file).and_return <<M
-version "1.2.3"
-M
+        Cookbook.any_instance.stub(:metadata_file).and_return(%Q{version "1.2.3"})
+
         subject.version_from_metadata_file.should == DepSelector::Version.new('1.2.3')
       end
     end

data/spec/spec_helper.rb

@@ -1,21 +1,59 @@
-$:.push File.join(File.dirname(__FILE__), '..')
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
+require 'bundler'
+require 'spork'
 
-require 'simplecov'
-require 'pp'
+Spork.prefork do
+  require 'rspec'
+  require 'simplecov'
+  require 'pp'
+  
+  APP_ROOT = File.expand_path('../../', __FILE__)
+  
+  Dir[File.join(APP_ROOT, "spec/support/**/*.rb")].each {|f| require f}
 
-RSpec.configure do |config|
-  config.after do
-    KnifeCookbookDependencies.clean
+  RSpec.configure do |config|    
+    config.mock_with :rspec
+    config.treat_symbols_as_metadata_keys_with_true_values = true
+    config.filter_run :focus => true
+    config.run_all_when_everything_filtered = true
+
+    config.after do
+      KnifeCookbookDependencies.clean
+    end
   end
-end
 
-SimpleCov.start do
-  add_filter 'spec/'
-end
+  SimpleCov.start do
+    add_filter 'spec/'
+  end
+
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+
+  def example_cookbook_from_path
+    @example_cookbook_from_path ||= KnifeCookbookDependencies::Cookbook.new('example_cookbook', path: File.join(File.dirname(__FILE__), 'fixtures', 'cookbooks'))
+  end
 
-require 'knife_cookbook_dependencies'
+  def with_cookbookfile content
+    Dir.chdir(ENV['TMPDIR']) do
+      File.open('Cookbookfile', 'w') do |f|
+        f.write content
+      end
+      yield
+    end
+  end
+
+end
 
-def example_cookbook_from_path
-  @example_cookbook_from_path ||= KnifeCookbookDependencies::Cookbook.new('example_cookbook', path: File.join(File.dirname(__FILE__), 'fixtures', 'cookbooks'))
+Spork.each_run do
+  require 'knife_cookbook_dependencies'
 end

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: knife_cookbook_dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
 - Josiah Kiehl
+- Jamie Winsor
+- Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dep_selector
-  requirement: &70196647928780 !ruby/object:Gem::Requirement
+  requirement: &70289787000100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196647928780
+  version_requirements: *70289787000100
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70196647928060 !ruby/object:Gem::Requirement
+  requirement: &70289786999120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +34,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196647928060
+  version_requirements: *70289786999120
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70196647943200 !ruby/object:Gem::Requirement
+  requirement: &70289786998280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +45,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196647943200
+  version_requirements: *70289786998280
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &70289786997780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786997780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196647940420 !ruby/object:Gem::Requirement
+  requirement: &70289786996860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +67,21 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70196647940420
+  version_requirements: *70289786996860
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70289786995900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786995900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196647936660 !ruby/object:Gem::Requirement
+  requirement: &70289786994760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +89,65 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196647936660
+  version_requirements: *70289786994760
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70196647944920 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70289786994280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196647944920
+  version_requirements: *70289786994280
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70196647960000 !ruby/object:Gem::Requirement
+  name: fuubar
+  requirement: &70289786993720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786993720
+- !ruby/object:Gem::Dependency
+  name: spork
+  requirement: &70289786993060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786993060
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70289786992500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786992500
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70289786991860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70289786991860
+- !ruby/object:Gem::Dependency
+  name: guard-spork
+  requirement: &70289786991260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +155,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196647960000
+  version_requirements: *70289786991260
 description: Resolves cookbook dependencies
 email:
 - josiah@skirmisher.net
+- jamie@vialstudios.com
+- erik@hollensbe.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -98,7 +168,7 @@ files:
 - .gitignore
 - .rbenv-version
 - Gemfile
-- Gemfile.lock
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -109,12 +179,14 @@ files:
 - lib/knife_cookbook_dependencies/cookbookfile.rb
 - lib/knife_cookbook_dependencies/dependency_reader.rb
 - lib/knife_cookbook_dependencies/dsl.rb
+- lib/knife_cookbook_dependencies/error_messages.rb
 - lib/knife_cookbook_dependencies/git.rb
 - lib/knife_cookbook_dependencies/knife_utils.rb
 - lib/knife_cookbook_dependencies/lockfile.rb
 - lib/knife_cookbook_dependencies/metacookbook.rb
 - lib/knife_cookbook_dependencies/shelf.rb
 - lib/knife_cookbook_dependencies/version.rb
+- spec/acceptance/knife_cookbook_dependencies_spec.rb
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb
@@ -126,7 +198,7 @@ files:
 - spec/lib/knife_cookbook_dependencies/shelf_spec.rb
 - spec/spec_helper.rb
 - todo.txt
-homepage: http://github.com/RiotGames/knife_cookbook_dependencies
+homepage: https://github.com/RiotGames/knife_cookbook_dependencies
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -151,6 +223,7 @@ signing_key:
 specification_version: 3
 summary: Resolves cookbook dependencies
 test_files:
+- spec/acceptance/knife_cookbook_dependencies_spec.rb
 - spec/fixtures/cookbooks/example_cookbook/README.md
 - spec/fixtures/cookbooks/example_cookbook/metadata.rb
 - spec/fixtures/cookbooks/example_cookbook/recipes/default.rb