librarian 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e028910687d6a6448f8f51929c7048701c10c768
+  data.tar.gz: f3d3ea0d6bffa41369b7bd224a2a93d5fe314fc8
+SHA512:
+  metadata.gz: b5b069d30eb1d8a067d7f7cd95d04e92570776e4ee7f08f9a6c4d572b0f3bc25026f5324d5686933bafed0e96247e23bea499f90c49a7c93397abc14241ddc9d
+  data.tar.gz: 02c8c5b25f217db0d2188cc2e4f48675fce74f9ff29ceb1fc30ea894c5ca511fd61c4e59a9e40a76c863c3307eeea5fa2f8344f281db086b3a4ce7d2ae158383

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-script: rspec spec
+script: rspec spec -b
 rvm:
   - 1.8.7
   - 1.9.2
@@ -12,8 +12,4 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.1.1
+
+* \#147. Handle the case where HOME is not in the environment. Thanks @bradleyd.
+
+* \#140. Properly handle the failure to clone a git repository. Avoid wiping out
+  the host project's changes.
+
+* \#127. Support Rubinius and JRuby, including when shelling out to system
+  commands.
+
+* \#144. Allow running the test suite with a simple `rake`. Thanks @nickhammond.
+
 ## 0.1.0
 
 * Extract the chef adapter to its own gem.

data/README.md

@@ -22,7 +22,11 @@ Ensure the gem dependencies are installed:
 
     $ bundle
 
-Run the tests:
+Run the tests with the default rake task:
+
+    $ [bundle exec] rake
+    
+or directly with the rspec command:
 
     $ [bundle exec] rspec spec
 

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'rspec/core/rake_task'
 
 module Bundler
   class GemHelper
@@ -21,3 +22,7 @@ module Bundler
 end
 
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec
+

data/lib/librarian/action/persist_resolution_mixin.rb

@@ -8,7 +8,7 @@ module Librarian
     private
 
       def persist_resolution(resolution)
-        resolution.correct? or raise Error,
+        resolution && resolution.correct? or raise Error,
           "Could not resolve the dependencies."
 
         lockfile_text = lockfile.save(resolution)

data/lib/librarian/cli.rb

@@ -183,13 +183,14 @@ module Librarian
       debug { "Rubinius Version: #{Rubinius::VERSION}" } if defined?(Rubinius)
       debug { "JRuby Version: #{JRUBY_VERSION}" } if defined?(JRUBY_VERSION)
       debug { "Rubygems Version: #{Gem::VERSION}" }
-      debug { "Librarian Version: #{VERSION}" }
+      debug { "Librarian Version: #{environment.version}" }
       debug { "Librarian Adapter: #{environment.adapter_name}"}
+      debug { "Librarian Adapter Version: #{environment.adapter_version}" }
       debug { "Project: #{environment.project_path}" }
       debug { "Specfile: #{relative_path_to(environment.specfile_path)}" }
       debug { "Lockfile: #{relative_path_to(environment.lockfile_path)}" }
       debug { "Git: #{Source::Git::Repository.bin}" }
-      debug { "Git Version: #{Source::Git::Repository.new(environment, environment.project_path).version(:silent => true)}" }
+      debug { "Git Version: #{Source::Git::Repository.git_version}" }
       debug { "Git Environment Variables:" }
       git_env = ENV.to_a.select{|(k, v)| k =~ /\AGIT/}.sort_by{|(k, v)| k}
       if git_env.empty?

data/lib/librarian/environment.rb

@@ -1,6 +1,7 @@
 require "pathname"
 require 'net/http'
 require "uri"
+require "etc"
 
 require "librarian/support/abstract_method"
 
@@ -26,9 +27,8 @@ module Librarian
     def initialize(options = { })
       @pwd = options.fetch(:pwd) { Dir.pwd }
       @env = options.fetch(:env) { ENV.to_hash }
-      @home = options.fetch(:home) { File.expand_path("~") }
+      @home = options.fetch(:home) { default_home }
       @project_path = options[:project_path]
-      @specfile_name = options[:specfile_name]
     end
 
     def logger
@@ -70,8 +70,19 @@ module Librarian
       Specfile.new(self, specfile_path)
     end
 
+    def adapter_module
+      implementation? or return
+      self.class.name.split("::")[0 ... -1].inject(Object, &:const_get)
+    end
+
     def adapter_name
-      nil
+      implementation? or return
+      Helpers.camel_cased_to_dasherized(self.class.name.split("::")[-2])
+    end
+
+    def adapter_version
+      implementation? or return
+      adapter_module::VERSION
     end
 
     def lockfile_name
@@ -124,7 +135,7 @@ module Librarian
     end
 
     def dsl_class
-      self.class.name.split("::")[0 ... -1].inject(Object, &:const_get)::Dsl
+      adapter_module::Dsl
     end
 
     def version
@@ -160,12 +171,7 @@ module Librarian
     end
 
     def net_http_class(host)
-      return Net::HTTP if no_proxy?(host)
-
-      @net_http_class ||= begin
-        p = http_proxy_uri
-        p ? Net::HTTP::Proxy(p.host, p.port, p.user, p.password) : Net::HTTP
-      end
+      no_proxy?(host) ? Net::HTTP : net_http_default_class
     end
 
   private
@@ -174,13 +180,31 @@ module Librarian
       self
     end
 
-    def no_proxy?(host)
-      @no_proxy ||= begin
+    def implementation?
+      self.class != ::Librarian::Environment
+    end
+
+    def default_home
+      File.expand_path(ENV["HOME"] || Etc.getpwnam(Etc.getlogin).dir)
+    end
+
+    def no_proxy_list
+      @no_proxy_list ||= begin
         list = ENV['NO_PROXY'] || ENV['no_proxy'] || ""
         list.split(/\s*,\s*/) + %w(localhost 127.0.0.1)
       end
-      @no_proxy.any? do |host_addr|
-        host.match(Regexp.quote(host_addr)+'$')
+    end
+
+    def no_proxy?(host)
+      no_proxy_list.any? do |host_addr|
+        host.end_with?(host_addr)
+      end
+    end
+
+    def net_http_default_class
+      @net_http_default_class ||= begin
+        p = http_proxy_uri
+        p ? Net::HTTP::Proxy(p.host, p.port, p.user, p.password) : Net::HTTP
       end
     end
 

data/lib/librarian/helpers.rb

@@ -1,4 +1,10 @@
 module Librarian
+
+  # PRIVATE
+  #
+  # Adapters must not rely on these methods since they will change.
+  #
+  # Adapters requiring similar methods ought to re-implement them.
   module Helpers
     extend self
 
@@ -9,5 +15,15 @@ module Librarian
       string.gsub(/^[ \t]{#{indent}}/, '')
     end
 
+    # [active_support/inflector/methods]
+    def camel_cased_to_dasherized(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1-\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1-\2')
+      word.downcase!
+      word
+    end
+
   end
+
 end

data/lib/librarian/mock/environment.rb

@@ -6,14 +6,6 @@ module Librarian
   module Mock
     class Environment < Environment
 
-      def adapter_name
-        "mock"
-      end
-
-      def adapter_version
-        VERSION
-      end
-
       def install_path
         nil
       end

data/lib/librarian/posix.rb

@@ -0,0 +1,120 @@
+require "open3"
+
+require "librarian/error"
+
+module Librarian
+  module Posix
+
+    class << self
+
+      # Cross-platform way of finding an executable in the $PATH.
+      #
+      #   which('ruby') #=> /usr/bin/ruby
+      #
+      # From:
+      #   https://github.com/defunkt/hub/commit/353031307e704d860826fc756ff0070be5e1b430#L2R173
+      def which(cmd)
+        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(';') : ['']
+        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+          path = File.expand_path(path)
+          exts.each do |ext|
+            exe = File.join(path, cmd + ext)
+            return exe if File.file?(exe) && File.executable?(exe)
+          end
+        end
+        nil
+      end
+
+      def which!(cmd)
+        which(cmd) or raise Error, "cannot find #{cmd}"
+      end
+
+    end
+
+    class CommandFailure < Error
+      class << self
+        def raise!(command, status, message)
+          ex = new(message)
+          ex.command = command
+          ex.status = status
+          ex.set_backtrace caller
+          raise ex
+        end
+      end
+
+      attr_accessor :command, :status
+    end
+
+    class << self
+
+      if defined?(JRuby) # built with jruby-1.7.4 in mind
+
+        def run!(command, options = { })
+          out, err = nil, nil
+          chdir = options[:chdir].to_s if options[:chdir]
+          env = options[:env] || { }
+          old_env = Hash[env.keys.map{|k| [k, ENV[k]]}]
+          begin
+            ENV.update env
+            Dir.chdir(chdir || Dir.pwd) do
+              IO.popen3(*command) do |i, o, e|
+                i.close
+                out, err = o.read, e.read
+              end
+            end
+          ensure
+            ENV.update old_env
+          end
+          $?.success? or CommandFailure.raise! command, $?, err
+          out
+        end
+
+      else
+
+        if RUBY_VERSION < "1.9"
+
+          def run!(command, options = { })
+            i, o, e = IO.pipe, IO.pipe, IO.pipe
+            pid = fork do
+              $stdin.reopen i[0]
+              $stdout.reopen o[1]
+              $stderr.reopen e[1]
+              [i[1], i[0], o[0], e[0]].each &:close
+              ENV.update options[:env] || { }
+              Dir.chdir options[:chdir].to_s if options[:chdir]
+              exec *command
+            end
+            [i[0], i[1], o[1], e[1]].each &:close
+            Process.waitpid pid
+            $?.success? or CommandFailure.raise! command, $?, e[0].read
+            o[0].read
+          ensure
+            [i, o, e].flatten(1).each{|io| io.close unless io.closed?}
+          end
+
+        else
+
+          def run!(command, options = { })
+            i, o, e = IO.pipe, IO.pipe, IO.pipe
+            opts = {:in => i[0], :out => o[1], :err => e[1]}
+            opts[:chdir] = options[:chdir].to_s if options[:chdir]
+            command = command.dup
+            command.unshift options[:env] || { }
+            command.push opts
+            pid = Process.spawn(*command)
+            [i[0], i[1], o[1], e[1]].each &:close
+            Process.waitpid pid
+            $?.success? or CommandFailure.raise! command, $?, e[0].read
+            o[0].read
+          ensure
+            [i, o, e].flatten(1).each{|io| io.close unless io.closed?}
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/librarian/source/git.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'digest'
 
+require 'librarian/error'
 require 'librarian/source/basic_api'
 require 'librarian/source/git/repository'
 require 'librarian/source/local'
@@ -79,6 +80,7 @@ module Librarian
           repository.path.rmtree if repository.path.exist?
           repository.path.mkpath
           repository.clone!(uri)
+          raise Error, "failed to clone #{uri}" unless repository.git?
         end
         repository.reset_hard!
         repository.clean!

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

@@ -1,4 +1,4 @@
-require 'open3'
+require "librarian/posix"
 
 module Librarian
   module Source
@@ -15,27 +15,12 @@ module Librarian
           end
 
           def bin
-            @bin ||= which("git") or raise Error, "cannot find git"
+            @bin ||= Posix.which!("git")
           end
 
-          private
-
-          # Cross-platform way of finding an executable in the $PATH.
-          #
-          #   which('ruby') #=> /usr/bin/ruby
-          #
-          # From:
-          #   https://github.com/defunkt/hub/commit/353031307e704d860826fc756ff0070be5e1b430#L2R173
-          def which(cmd)
-            exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-            ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-              path = File.expand_path(path)
-              exts.each do |ext|
-                exe = File.join(path, cmd + ext)
-                return exe if File.file?(exe) && File.executable?(exe)
-              end
-            end
-            nil
+          def git_version
+            command = %W[#{bin} version --silent]
+            Posix.run!(command).strip =~ /([.\d]+)$/ && $1
           end
         end
 
@@ -55,17 +40,6 @@ module Librarian
           "origin"
         end
 
-        def version(options = { })
-          version!(options).strip
-        end
-
-        def version!(options = { })
-          silent = options.delete(:silent)
-
-          command = %w(--version)
-          run!(command, :silent => silent)
-        end
-
         def clone!(repository_url)
           command = %W(clone #{repository_url} . --quiet)
           run!(command, :chdir => true)
@@ -143,32 +117,15 @@ module Librarian
           chdir = path.to_s if chdir == true
 
           silent = options.delete(:silent)
+          pwd = chdir || Dir.pwd
+          git_dir = File.join(path, ".git") if path
+          env = {"GIT_DIR" => git_dir}
 
           command = [bin]
           command.concat(args)
 
-          maybe_within(chdir) do
-            logging_command(command, :silent => silent) do
-              run_command_internal(command)
-            end
-          end
-        end
-
-        def maybe_within(path)
-          if path
-            Dir.chdir(path) { with_env_var("GIT_DIR", nil) { yield } }
-          else
-            yield
-          end
-        end
-
-        def with_env_var(name, value)
-          original_value = ENV[name]
-          begin
-            ENV[name] = value
-            yield
-          ensure
-            ENV[name] = original_value
+          logging_command(command, :silent => silent, :pwd => pwd) do
+            Posix.run!(command, :chdir => chdir, :env => env)
           end
         end
 
@@ -177,10 +134,6 @@ module Librarian
 
           pwd = Dir.pwd
 
-          unless silent
-            debug { "Running `#{command.join(' ')}` in #{relative_path_to(pwd)}" }
-          end
-
           out = yield
 
           unless silent
@@ -196,21 +149,6 @@ module Librarian
           out
         end
 
-        def run_command_internal(command)
-          std = ""
-          err = ""
-          thread = nil
-          Open3.popen3(*command) do |i, o, e, t|
-            std = o.read
-            err = e.read
-            thread = t
-          end
-
-          raise StandardError, err unless (thread ? thread.value : $?).success?
-
-          std
-        end
-
         def debug(*args, &block)
           environment.logger.debug(*args, &block)
         end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/librarian.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "librarian"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Feldblum"]
-  s.date = "2013-04-03"
-  s.description = "Librarian"
+  s.date = "2013-08-17"
+  s.description = "A Framework for Bundlers."
   s.email = ["y_feldblum@yahoo.com"]
-  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "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/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "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/linter/source_linter.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/mock/version.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.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/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_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.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "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/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "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/linter/source_linter.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/mock/version.rb", "lib/librarian/posix.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/rspec/support/cli_macro.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.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/cli_spec.rb", "spec/functional/posix_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/functional/source/git_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_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/environment_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.rubygems_version = "1.8.25"
-  s.summary = "Librarian"
-  s.test_files = ["spec/functional/cli_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_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.rubygems_version = "2.0.3"
+  s.summary = "A Framework for Bundlers."
+  s.test_files = ["spec/functional/cli_spec.rb", "spec/functional/posix_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/functional/source/git_spec.rb", "spec/support/fakefs.rb", "spec/support/method_patch_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/environment_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"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.15"])

data/spec/functional/posix_spec.rb

@@ -0,0 +1,34 @@
+require "librarian/posix"
+
+describe Librarian::Posix 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_path) { project_path + "tmp/spec/functional/posix" }
+  after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
+
+  describe ".run!" do
+
+    it "returns the stdout" do
+      res = described_class.run!(%w[echo hello there]).strip
+      res.should be == "hello there"
+    end
+
+    it "changes directory" do
+      tmp_path.mkpath
+      res = described_class.run!(%w[pwd], :chdir => tmp_path).strip
+      res.should be == tmp_path.to_s
+    end
+
+    it "reads the env" do
+      res = described_class.run!(%w[env], :env => {"KOALA" => "BEAR"})
+      line = res.lines.find{|l| l.start_with?("KOALA=")}.strip
+      line.should be == "KOALA=BEAR"
+    end
+
+  end
+
+end

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

@@ -2,6 +2,8 @@ require "fileutils"
 require "pathname"
 require "securerandom"
 
+require "librarian/posix"
+
 require "librarian/source/git/repository"
 
 describe Librarian::Source::Git::Repository do
@@ -22,45 +24,53 @@ describe Librarian::Source::Git::Repository do
   let(:tag) { "the-tag" }
   let(:atag) { "the-atag" }
 
+  def cmd!(command)
+    Librarian::Posix.run! command
+  end
+
+  def git!(command)
+    cmd!([described_class.bin] + command)
+  end
+
   before do
     git_source_path.mkpath
     Dir.chdir(git_source_path) do
-      `git init`
-      `git config user.name "Simba"`
-      `git config user.email "simba@savannah-pride.gov"`
+      git! %W[init]
+      git! %W[config user.name Simba]
+      git! %W[config user.email simba@savannah-pride.gov]
 
       # master
-      `touch butter.txt`
-      `git add butter.txt`
-      `git commit -m "Initial Commit"`
+      FileUtils.touch "butter.txt"
+      git! %W[add butter.txt]
+      git! %W[commit -m #{"Initial Commit"}]
 
       # branch
-      `git checkout -b #{branch} --quiet`
-      `touch jam.txt`
-      `git add jam.txt`
-      `git commit -m "Branch Commit"`
-      `git checkout master --quiet`
-
-      # tag
-      `git checkout -b deletable --quiet`
-      `touch jelly.txt`
-      `git add jelly.txt`
-      `git commit -m "Tag Commit"`
-      `git tag #{tag}`
-      `git checkout master --quiet`
-      `git branch -D deletable`
-
-      # annotated tag
-      `git checkout -b deletable --quiet`
-      `touch jelly.txt`
-      `git add jelly.txt`
-      `git commit -m "Tag Commit"`
-      `git tag -am "Annotated Tag Commit" #{atag}`
-      `git checkout master --quiet`
-      `git branch -D deletable`
+      git! %W[checkout -b #{branch} --quiet]
+      FileUtils.touch "jam.txt"
+      git! %W[add jam.txt]
+      git! %W[commit -m #{"Branch Commit"}]
+      git! %W[checkout master --quiet]
+
+      # tag/atag
+      git! %W[checkout -b deletable --quiet]
+      FileUtils.touch "jelly.txt"
+      git! %W[add jelly.txt]
+      git! %W[commit -m #{"Tag Commit"}]
+      git! %W[tag #{tag}]
+      git! %W[tag -am #{"Annotated Tag Commit"} #{atag}]
+      git! %W[checkout master --quiet]
+      git! %W[branch -D deletable]
     end
   end
 
+  describe ".bin" do
+    specify { described_class.bin.should_not be_empty }
+  end
+
+  describe ".git_version" do
+    specify { described_class.git_version.should =~ /^\d+(\.\d+)+$/ }
+  end
+
   context "the original" do
     subject { described_class.new(env, git_source_path) }
 
@@ -75,6 +85,15 @@ describe Librarian::Source::Git::Repository do
     it "should not list any remote branches for it" do
       subject.remote_branch_names.should be_empty
     end
+
+    it "should have divergent shas for master, branch, tag, and atag" do
+      revs = %W[ master #{branch} #{tag} #{atag} ]
+      rev_parse = proc{|rev| git!(%W[rev-parse #{rev} --quiet]).strip}
+      shas = Dir.chdir(git_source_path){revs.map(&rev_parse)}
+      shas.map(&:class).uniq.should be == [String]
+      shas.map(&:size).uniq.should be == [40]
+      shas.uniq.should be == shas
+    end
   end
 
   context "a clone" do

data/spec/functional/source/git_spec.rb

@@ -0,0 +1,30 @@
+require "pathname"
+require "securerandom"
+
+require "librarian/error"
+require "librarian/source/git"
+
+describe Librarian::Source::Git 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_path) { project_path + "tmp/spec/functional/source/git" }
+  after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
+  let(:cache_path) { tmp_path + "cache" }
+
+  context "when the remote is bad" do
+    let(:remote) { tmp_path.join(SecureRandom.hex(8)).to_s }
+    let(:logger) { double(:debug => nil, :info => nil) }
+    let(:env) { double(:ui => nil, :logger => logger, :cache_path => cache_path) }
+    let(:source) { described_class.new(env, remote, {}) }
+
+    it "fails when caching" do
+      expect { source.cache! }.to raise_error Librarian::Error,
+        /^fatal: repository .+ does not exist$/ # from git
+    end
+  end
+
+end

data/spec/support/fakefs.rb

@@ -2,6 +2,19 @@ require "fakefs/safe"
 require "fakefs/spec_helpers"
 require "support/method_patch_macro"
 
+if defined?(Rubinius)
+  module Rubinius
+    class CodeLoader
+      class << self
+        alias_method :require_fakefs_original, :require
+        def require(s)
+          ::FakeFS.without { require_fakefs_original(s) }
+        end
+      end
+    end
+  end
+end
+
 module Support
   module FakeFS
 

data/spec/unit/action/base_spec.rb

@@ -3,7 +3,7 @@ require "librarian/action/base"
 module Librarian
   describe Action::Base do
 
-    let(:env) { mock }
+    let(:env) { double }
     let(:action) { described_class.new(env) }
 
     subject { action }

data/spec/unit/action/clean_spec.rb

@@ -3,7 +3,7 @@ require "librarian/action/clean"
 module Librarian
   describe Action::Clean do
 
-    let(:env) { mock }
+    let(:env) { double }
     let(:action) { described_class.new(env) }
 
     before do
@@ -68,7 +68,7 @@ module Librarian
             end
 
             it "should try to clear the install path" do
-              children = [mock, mock, mock]
+              children = [double, double, double]
               children.each do |child|
                 child.stub(:file?) { false }
               end
@@ -80,7 +80,7 @@ module Librarian
             end
 
             it "should only try to clear out directories from the install path, not files" do
-              children = [mock(:file? => false), mock(:file? => true), mock(:file? => true)]
+              children = [double(:file? => false), double(:file? => true), double(:file? => true)]
               env.stub_chain(:install_path, :children) { children }
 
               children.select(&:file?).each do |child|

data/spec/unit/action/ensure_spec.rb

@@ -6,7 +6,7 @@ require "librarian/action/ensure"
 module Librarian
   describe Action::Ensure do
 
-    let(:env) { mock }
+    let(:env) { double }
     let(:action) { described_class.new(env) }
 
     before do

data/spec/unit/action/install_spec.rb

@@ -4,7 +4,7 @@ require "librarian/action/install"
 module Librarian
   describe Action::Install do
 
-    let(:env) { mock(:specfile_name => "Specfile", :lockfile_name => "Specfile.lock") }
+    let(:env) { double(:specfile_name => "Specfile", :lockfile_name => "Specfile.lock") }
     let(:action) { described_class.new(env) }
 
     describe "#run" do
@@ -69,7 +69,7 @@ module Librarian
 
           let(:manifests) { 3.times.map{|i| mock_manifest(i)} }
           let(:sorted_manifests) { 4.times.map{|i| mock_manifest(i + 3)} }
-          let(:install_path) { mock }
+          let(:install_path) { double }
 
           before do
             env.stub(:install_path) { install_path }

data/spec/unit/environment_spec.rb

@@ -8,6 +8,41 @@ module Librarian
 
     let(:env) { described_class.new }
 
+    describe "#adapter_module" do
+      specify { env.adapter_module.should be nil }
+    end
+
+    describe "#adapter_name" do
+      specify { env.adapter_name.should be nil }
+    end
+
+    describe "#adapter_version" do
+      specify { env.adapter_version.should be nil }
+    end
+
+    describe "computing the home" do
+
+      context "with the HOME env var" do
+        with_env "HOME" => "/path/to/home"
+
+        it "finds the home" do
+          env.stub(:adapter_name).and_return("cat")
+          env.config_db.underlying_home.to_s.should == "/path/to/home"
+        end
+      end
+
+      context "without the HOME env var" do
+        let!(:real_home) { File.expand_path("~") }
+        with_env "HOME" => nil
+
+        it "finds the home" do
+          env.stub(:adapter_name).and_return("cat")
+          env.config_db.underlying_home.to_s.should == real_home
+        end
+      end
+
+    end
+
     describe "#http_proxy_uri" do
 
       context "sanity" do
@@ -165,6 +200,7 @@ module Librarian
             env.net_http_class(proxied_host).should be_proxy_class
           end
         end
+
       end
 
     end

data/spec/unit/mock/environment_spec.rb

@@ -0,0 +1,25 @@
+require "librarian/mock/environment"
+
+module Librarian::Mock
+  describe Environment do
+
+    let(:env) { described_class.new }
+
+    describe "#version" do
+      specify { env.version.should be == Librarian::VERSION }
+    end
+
+    describe "#adapter_module" do
+      specify { env.adapter_module.should be Librarian::Mock }
+    end
+
+    describe "#adapter_name" do
+      specify { env.adapter_name.should be == "mock" }
+    end
+
+    describe "#adapter_version" do
+      specify { env.adapter_version.should be == Librarian::Mock::VERSION }
+    end
+
+  end
+end

metadata

@@ -1,113 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jay Feldblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.15'
   name: thor
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  type: :development
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
-  name: fakefs
+  type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.2
-description: Librarian
+description: A Framework for Bundlers.
 email:
 - y_feldblum@yahoo.com
 executables: []
@@ -161,6 +148,7 @@ files:
 - lib/librarian/mock/source/mock.rb
 - lib/librarian/mock/source/mock/registry.rb
 - lib/librarian/mock/version.rb
+- lib/librarian/posix.rb
 - lib/librarian/resolution.rb
 - lib/librarian/resolver.rb
 - lib/librarian/resolver/implementation.rb
@@ -179,7 +167,9 @@ files:
 - lib/librarian/version.rb
 - librarian.gemspec
 - spec/functional/cli_spec.rb
+- spec/functional/posix_spec.rb
 - spec/functional/source/git/repository_spec.rb
+- spec/functional/source/git_spec.rb
 - spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
 - spec/support/with_env_macro.rb
@@ -195,40 +185,39 @@ files:
 - spec/unit/lockfile_spec.rb
 - spec/unit/manifest_set_spec.rb
 - spec/unit/manifest_spec.rb
+- spec/unit/mock/environment_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
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -845093804329551248
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Librarian
+specification_version: 4
+summary: A Framework for Bundlers.
 test_files:
 - spec/functional/cli_spec.rb
+- spec/functional/posix_spec.rb
 - spec/functional/source/git/repository_spec.rb
+- spec/functional/source/git_spec.rb
 - spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
 - spec/support/with_env_macro.rb
@@ -244,6 +233,7 @@ test_files:
 - spec/unit/lockfile_spec.rb
 - spec/unit/manifest_set_spec.rb
 - spec/unit/manifest_spec.rb
+- spec/unit/mock/environment_spec.rb
 - spec/unit/mock/source/mock_spec.rb
 - spec/unit/resolver_spec.rb
 - spec/unit/source/git_spec.rb