librarian 0.0.24 → 0.0.25

data/lib/librarian/source/git/repository.rb

@@ -1,7 +1,5 @@
 require 'open3'
 
-require 'librarian/helpers/debug'
-
 module Librarian
   module Source
     class Git
@@ -41,8 +39,6 @@ module Librarian
           end
         end
 
-        include Helpers::Debug
-
         attr_accessor :environment, :path
         private :environment=, :path=
 
@@ -77,7 +73,7 @@ module Librarian
 
         def checkout!(reference, options ={ })
           command = %W(checkout #{reference} --quiet)
-          command <<  "--force" if options[:force]
+          command << "--force" if options[:force]
           run!(command, :chdir => true)
         end
 
@@ -207,6 +203,14 @@ module Librarian
           end
         end
 
+        def debug(*args, &block)
+          environment.logger.debug(*args, &block)
+        end
+
+        def relative_path_to(path)
+          environment.logger.relative_path_to(path)
+        end
+
       end
     end
   end

data/lib/librarian/source/local.rb

@@ -1,4 +1,3 @@
-require 'librarian/helpers/debug'
 require 'librarian/support/abstract_method'
 
 module Librarian
@@ -8,7 +7,6 @@ module Librarian
     #   #environment
     module Local
 
-      include Helpers::Debug
       include Support::AbstractMethod
 
       abstract_method :path, :fetch_version, :fetch_dependencies
@@ -46,6 +44,18 @@ module Librarian
 
       abstract_method :manifest? # (name, path) -> boolean
 
+      def info(*args, &block)
+        environment.logger.info(*args, &block)
+      end
+
+      def debug(*args, &block)
+        environment.logger.debug(*args, &block)
+      end
+
+      def relative_path_to(path)
+        environment.logger.relative_path_to(path)
+      end
+
     end
   end
 end

data/lib/librarian/spec.rb

@@ -1,11 +1,11 @@
 module Librarian
   class Spec
 
-    attr_accessor :source, :dependencies
-    private :source=, :dependencies=
+    attr_accessor :sources, :dependencies
+    private :sources=, :dependencies=
 
-    def initialize(source, dependencies)
-      self.source = source
+    def initialize(sources, dependencies)
+      self.sources = sources
       self.dependencies = dependencies
     end
 

data/lib/librarian/spec_change_set.rb

@@ -1,5 +1,4 @@
 require 'librarian/helpers'
-require 'librarian/helpers/debug'
 
 require 'librarian/manifest_set'
 require 'librarian/resolution'
@@ -8,8 +7,6 @@ require 'librarian/spec'
 module Librarian
   class SpecChangeSet
 
-    include Helpers::Debug
-
     attr_accessor :environment
     private :environment=
     attr_reader :spec, :lock
@@ -71,7 +68,7 @@ module Librarian
     def explicit_removed_dependency_names
       @explicit_removed_dependency_names ||= removed_dependency_names.reject do |name|
         lock_manifest = lock_manifests_index[name]
-        lock_manifest.source == spec.source
+        spec.sources.include?(lock_manifest.source)
       end.to_set
     end
 
@@ -166,5 +163,11 @@ module Librarian
       end
     end
 
+  private
+
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
   end
 end

data/lib/librarian/specfile.rb

@@ -1,17 +1,12 @@
-require 'librarian/helpers/debug'
-
 module Librarian
   class Specfile
 
-    include Helpers::Debug
-
-    attr_accessor :environment
-    private :environment=
-    attr_reader :path, :dependencies, :source
+    attr_accessor :environment, :path
+    private :environment=, :path=
 
     def initialize(environment, path)
       self.environment = environment
-      @path = path
+      self.path = path
     end
 
     def read(precache_sources = [])

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/librarian.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "librarian"
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Feldblum"]
-  s.date = "2012-06-23"
+  s.date = "2012-10-12"
   s.description = "Librarian"
   s.email = ["y_feldblum@yahoo.com"]
   s.executables = ["librarian-chef", "librarian-mock"]
-  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "bin/librarian-chef", "bin/librarian-mock", "config/cucumber.yaml", "features/chef/cli/init.feature", "features/chef/cli/install.feature", "features/chef/cli/show.feature", "features/chef/cli/version.feature", "features/support/env.rb", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/chef.rb", "lib/librarian/chef/cli.rb", "lib/librarian/chef/dsl.rb", "lib/librarian/chef/environment.rb", "lib/librarian/chef/extension.rb", "lib/librarian/chef/integration/knife.rb", "lib/librarian/chef/manifest_reader.rb", "lib/librarian/chef/source.rb", "lib/librarian/chef/source/git.rb", "lib/librarian/chef/source/local.rb", "lib/librarian/chef/source/path.rb", "lib/librarian/chef/source/site.rb", "lib/librarian/chef/templates/Cheffile", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/helpers/debug.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/source.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/chef/source/git_spec.rb", "spec/functional/chef/source/site_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
+  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "bin/librarian-chef", "bin/librarian-mock", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/chef.rb", "lib/librarian/chef/cli.rb", "lib/librarian/chef/dsl.rb", "lib/librarian/chef/environment.rb", "lib/librarian/chef/extension.rb", "lib/librarian/chef/integration/knife.rb", "lib/librarian/chef/manifest_reader.rb", "lib/librarian/chef/source.rb", "lib/librarian/chef/source/git.rb", "lib/librarian/chef/source/local.rb", "lib/librarian/chef/source/path.rb", "lib/librarian/chef/source/site.rb", "lib/librarian/chef/templates/Cheffile", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/source.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/chef/cli_spec.rb", "spec/functional/chef/source/git_spec.rb", "spec/functional/chef/source/site_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/cli_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
   s.homepage = ""
   s.require_paths = ["lib"]
   s.rubyforge_project = "librarian"
@@ -24,8 +24,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, ["~> 0.15"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<aruba>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<fakefs>, [">= 0"])
       s.add_runtime_dependency(%q<chef>, [">= 0.10"])
@@ -35,8 +33,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, ["~> 0.15"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<fakefs>, [">= 0"])
       s.add_dependency(%q<chef>, [">= 0.10"])
@@ -47,8 +43,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, ["~> 0.15"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<fakefs>, [">= 0"])
     s.add_dependency(%q<chef>, [">= 0.10"])

data/spec/functional/chef/cli_spec.rb

@@ -0,0 +1,194 @@
+require "securerandom"
+
+require "support/cli_macro"
+
+require "librarian/chef/cli"
+
+module Librarian
+  module Chef
+    describe Cli do
+      include CliMacro
+
+      describe "init" do
+        before do
+          cli! "init"
+        end
+
+        it "should create a file named Cheffile" do
+          pwd.should have_file "Cheffile"
+        end
+      end
+
+      describe "version" do
+        before do
+          cli! "version"
+        end
+
+        it "should print the version" do
+          stdout.should == strip_heredoc(<<-STDOUT)
+            librarian-#{VERSION}
+          STDOUT
+        end
+      end
+
+      describe "install" do
+
+        context "a simple Cheffile with one cookbook" do
+          let(:metadata) { {
+            "name" => "apt",
+            "version" => "1.0.0",
+            "dependencies" => { },
+          } }
+
+          before do
+            write_json_file! "cookbook-sources/apt/metadata.json", metadata
+            write_file! "Cheffile", strip_heredoc(<<-CHEFFILE)
+              cookbook 'apt',
+                :path => 'cookbook-sources'
+            CHEFFILE
+
+            cli! "install"
+          end
+
+          it "should write a lockfile" do
+            pwd.should have_file "Cheffile.lock"
+          end
+
+          it "should install the cookbook" do
+            pwd.should have_json_file "cookbooks/apt/metadata.json", metadata
+          end
+        end
+
+        context "a simple Cheffile with one cookbook with one dependency" do
+          let(:main_metadata) { {
+            "name" => "main",
+            "version" => "1.0.0",
+            "dependencies" => {
+              "sub" => "1.0.0",
+            }
+          } }
+          let(:sub_metadata) { {
+            "name" => "sub",
+            "version" => "1.0.0",
+            "dependencies" => { },
+          } }
+
+          before do
+            write_json_file! "cookbook-sources/main/metadata.json", main_metadata
+            write_json_file! "cookbook-sources/sub/metadata.json", sub_metadata
+            write_file! "Cheffile", strip_heredoc(<<-CHEFFILE)
+              path 'cookbook-sources'
+              cookbook 'main'
+            CHEFFILE
+
+            cli! "install"
+          end
+
+          it "should write a lockfile" do
+            pwd.should have_file "Cheffile.lock"
+          end
+
+          it "should install the dependant cookbook" do
+            pwd.should have_json_file "cookbooks/main/metadata.json", main_metadata
+          end
+
+          it "should install the independent cookbook" do
+            pwd.should have_json_file "cookbooks/sub/metadata.json", sub_metadata
+          end
+        end
+
+      end
+
+      describe "show" do
+        let(:main_metadata) { {
+          "name" => "main",
+          "version" => "1.0.0",
+          "dependencies" => {
+            "sub" => "1.0.0",
+          }
+        } }
+        let(:sub_metadata) { {
+          "name" => "sub",
+          "version" => "1.0.0",
+          "dependencies" => { },
+        } }
+
+        before do
+          write_json_file! "cookbook-sources/main/metadata.json", main_metadata
+          write_json_file! "cookbook-sources/sub/metadata.json", sub_metadata
+          write_file! "Cheffile", strip_heredoc(<<-CHEFFILE)
+            path 'cookbook-sources'
+            cookbook 'main'
+          CHEFFILE
+
+          cli! "install"
+        end
+
+        context "showing all without a lockfile" do
+          before do
+            pwd.join("Cheffile.lock").delete
+
+            cli! "show"
+          end
+
+          specify { exit_status.should == 1 }
+
+          it "should print a warning" do
+            stdout.should == strip_heredoc(<<-STDOUT)
+              Be sure to install first!
+            STDOUT
+          end
+        end
+
+        context "showing all" do
+          before do
+            cli! "show"
+          end
+
+          specify { exit_status.should == 0 }
+
+          it "should print a summary" do
+            stdout.should == strip_heredoc(<<-STDOUT)
+              main (1.0.0)
+              sub (1.0.0)
+            STDOUT
+          end
+        end
+
+        context "showing one without dependencies" do
+          before do
+            cli! "show", "sub"
+          end
+
+          specify { exit_status.should == 0 }
+
+          it "should print the details" do
+            stdout.should == strip_heredoc(<<-STDOUT)
+              sub (1.0.0)
+                source: cookbook-sources
+            STDOUT
+          end
+        end
+
+        context "showing one with dependencies" do
+          before do
+            cli! "show", "main"
+          end
+
+          specify { exit_status.should == 0 }
+
+          it "should print the details" do
+            stdout.should == strip_heredoc(<<-STDOUT)
+              main (1.0.0)
+                source: cookbook-sources
+                dependencies:
+                  sub (= 1.0.0)
+            STDOUT
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/spec/functional/chef/source/site_spec.rb

@@ -44,19 +44,20 @@ module Librarian
             "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
           }
         end
+        let(:sample_0_6_5_package) do
+          s = StringIO.new
+          z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
+          t = Archive::Tar::Minitar::Output.new(z)
+          t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+            :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+          t.close
+          z.close unless z.closed?
+          s.string
+        end
 
         # depends on repo_path being defined in each context
         let(:env) { Environment.new(:project_path => repo_path) }
 
-        before :all do
-          sample_path.rmtree if sample_path.exist?
-          sample_path.mkpath
-          sample_path.join("metadata.rb").open("wb") { |f| f.write(sample_metadata) }
-          Dir.chdir(sample_path.dirname) do
-            system "tar --create --gzip --file sample.tar.gz #{sample_path.basename}"
-          end
-        end
-
         before do
           stub_request(:get, "#{api_url}/cookbooks/sample").
             to_return(:body => JSON.dump(sample_index_data))
@@ -65,7 +66,7 @@ module Librarian
             to_return(:body => JSON.dump(sample_0_6_5_data))
 
           stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz").
-            to_return(:body => sample_path.dirname.join("sample.tar.gz").read)
+            to_return(:body => sample_0_6_5_package)
         end
 
         after do

data/spec/functional/source/git/repository_spec.rb

@@ -7,7 +7,7 @@ require "librarian/source/git/repository"
 describe Librarian::Source::Git::Repository do
 
   let(:env) do
-    double(:ui => nil)
+    double(:ui => nil, :logger => double(:debug => nil, :info => nil))
   end
 
   let(:project_path) do

data/spec/support/cli_macro.rb

@@ -0,0 +1,122 @@
+require "json"
+require "pathname"
+require "securerandom"
+require "stringio"
+require "thor"
+
+require "librarian/helpers"
+
+module CliMacro
+
+  class FakeShell < Thor::Shell::Basic
+    def stdout
+      @stdout ||= StringIO.new
+    end
+    def stderr
+      @stderr ||= StringIO.new
+    end
+    def stdin
+      raise "unsupported"
+    end
+  end
+
+  class FileMatcher
+    attr_accessor :rel_path, :content, :type, :base_path
+    def initialize(rel_path, content, options = { })
+      self.rel_path = rel_path
+      self.content = content
+      self.type = options[:type]
+    end
+    def full_path
+      @full_path ||= base_path + rel_path
+    end
+    def actual_content
+      @actual_content ||= begin
+        s = full_path.read
+        s = JSON.parse(s) if type == :json
+        s
+      end
+    end
+    def matches?(base_path)
+      base_path = Pathname(base_path) unless Pathname === base_path
+      self.base_path = base_path
+
+      full_path.file? && (!content || actual_content == content)
+    end
+  end
+
+  def self.included(base)
+    base.instance_exec do
+      let(:project_path) do
+        project_path = Pathname.new(__FILE__).expand_path
+        project_path = project_path.dirname until project_path.join("Rakefile").exist?
+        project_path
+      end
+      let(:tmp) { project_path.join("tmp/spec/cli") }
+      let(:pwd) { tmp + SecureRandom.hex(8) }
+
+      before { tmp.mkpath }
+      before { pwd.mkpath }
+
+      after  { tmp.rmtree }
+    end
+  end
+
+  def cli!(*args)
+    Dir.chdir(pwd) do
+      described_class.with_environment do |environment|
+        begin
+          @shell = FakeShell.new
+          @exit_status = nil
+          described_class.start args, :shell => @shell
+          @exit_status = 0
+        rescue Librarian::Error => e
+          environment.ui.error e.message
+          environment.ui.debug e.backtrace.join("\n")
+          @exit_status = e.respond_to?(:status_code) ? e.status_code : 1
+        rescue Exception => e
+          @exit_status = 1
+        end
+      end
+    end
+  end
+
+  def write_file!(path, content)
+    path = pwd.join(path)
+    path.dirname.mkpath
+    path.open("wb"){|f| f.write(content)}
+  end
+
+  def write_json_file!(path, content)
+    write_file! path, JSON.dump(content)
+  end
+
+  def strip_heredoc(text)
+    Librarian::Helpers.strip_heredoc(text)
+  end
+
+  def shell
+    @shell
+  end
+
+  def stdout
+    shell.stdout.string
+  end
+
+  def stderr
+    shell.stderr.string
+  end
+
+  def exit_status
+    @exit_status
+  end
+
+  def have_file(rel_path, content = nil)
+    FileMatcher.new(rel_path, content)
+  end
+
+  def have_json_file(rel_path, content)
+    FileMatcher.new(rel_path, content, :type => :json)
+  end
+
+end