librarian 0.0.15 → 0.0.16

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Change Log
+
+## 0.0.16
+
+* Recache site-sourced dependency metadata per each run.
+
+* \#46. Always install.
+
+* \#53. Abstract versions & requirements from rubygems.
+
+* Own the install path. Recreate it on each install.
+    WARNING: If you have your own content in the install path, it will be deleted without mercy.
+
 ## 0.0.15
 
 * Rewrite the README.

data/lib/librarian/action/install.rb

@@ -47,7 +47,8 @@ module Librarian
       end
 
       def create_install_path
-        install_path.mkpath unless install_path.exist?
+        install_path.rmtree if install_path.exist?
+        install_path.mkpath
       end
 
       def install_manifests(manifests)

data/lib/librarian/chef/environment.rb

@@ -6,8 +6,8 @@ module Librarian
   module Chef
     class Environment < Environment
 
-      def specfile_name
-        "Cheffile"
+      def adapter_name
+        "chef"
       end
 
       def install_path

data/lib/librarian/chef/source/site.rb

@@ -144,7 +144,8 @@ module Librarian
           dependency_cache_path = cache_path.join(dependency.name)
           dependency_cache_path.mkpath
           metadata_cache_path = metadata_cache_path(dependency)
-          unless metadata_cache_path.exist?
+
+          caching_metadata do
             dep_uri = URI.parse(dependency_uri(dependency))
             debug { "Caching #{dep_uri}" }
             http = Net::HTTP.new(dep_uri.host, dep_uri.port)
@@ -161,6 +162,13 @@ module Librarian
           end
         end
 
+        def caching_metadata
+          return if @_metadata_cached
+          result = yield
+          @_metadata_cached = true
+          result
+        end
+
         def cache_version_metadata!(dependency, version_uri)
           version_cache_path = version_cache_path(dependency, version_uri)
           unless version_cache_path.exist?

data/lib/librarian/cli.rb

@@ -57,7 +57,7 @@ module Librarian
       clean!
     end
 
-    desc "install", "Installs all of the dependencies you specify."
+    desc "install", "Resolves and installs all of the dependencies you specify."
     method_option "verbose"
     method_option "line-numbers"
     method_option "clean"
@@ -68,17 +68,7 @@ module Librarian
       install!
     end
 
-    desc "resolve", "Resolves the dependencies you specify."
-    method_option "verbose"
-    method_option "line-numbers"
-    method_option "clean"
-    def resolve
-      ensure!
-      clean! if options["clean"]
-      resolve!
-    end
-
-    desc "update", "Updates the dependencies you specify."
+    desc "update", "Updates and installs the dependencies you specify."
     method_option "verbose"
     method_option "line-numbers"
     def update(*names)
@@ -88,6 +78,7 @@ module Librarian
       else
         update!(:names => names)
       end
+      install!
     end
 
     desc "init", "Initializes the current directory."

data/lib/librarian/dependency.rb

@@ -5,7 +5,39 @@ require 'librarian/helpers/debug'
 module Librarian
   class Dependency
 
-    class Requirement < Gem::Requirement
+    class Requirement
+      def initialize(*args)
+        args = initialize_normalize_args(args)
+
+        self.backing = Gem::Requirement.create(*args)
+      end
+
+      def to_gem_requirement
+        backing
+      end
+
+      def satisfied_by?(version)
+        to_gem_requirement.satisfied_by?(version.to_gem_version)
+      end
+
+      def ==(other)
+        to_gem_requirement == other.to_gem_requirement
+      end
+
+      def to_s
+        to_gem_requirement.to_s
+      end
+
+      private
+
+      def initialize_normalize_args(args)
+        args.map do |arg|
+          arg = [arg] if self.class === arg
+          arg
+        end
+      end
+
+      attr_accessor :backing
     end
 
     include Helpers::Debug
@@ -17,7 +49,7 @@ module Librarian
       assert_name_valid! name
 
       self.name = name
-      self.requirement = Requirement.create(requirement)
+      self.requirement = Requirement.new(requirement)
       self.source = source
 
       @manifests = nil

data/lib/librarian/environment.rb

@@ -21,17 +21,35 @@ module Librarian
 
     def initialize(options = { })
       @project_path = options[:project_path]
+      @specfile_name = options[:specfile_name]
     end
 
     def project_path
       @project_path ||= begin
         root = Pathname.new(Dir.pwd)
-        root = root.dirname until root.join(specfile_name).exist? || root.dirname == root
+        root = root.dirname until project_path?(root)
         path = root.join(specfile_name)
-        path.exist? ? root : nil
+        path.file? ? root : nil
       end
     end
 
+    def project_path?(path)
+      path.join(config_name).directory? ||
+      path.join(specfile_name).file? ||
+      path.dirname == path
+    end
+
+    def default_specfile_name
+      @default_specfile_name ||= begin
+        capped = adapter_name.capitalize
+        "#{capped}file"
+      end
+    end
+
+    def specfile_name
+      @specfile_name ||= default_specfile_name
+    end
+
     def specfile_path
       project_path.join(specfile_name)
     end
@@ -40,6 +58,18 @@ module Librarian
       Specfile.new(self, specfile_path)
     end
 
+    def adapter_name
+      nil
+    end
+
+    def config_name
+      File.join(*[config_prefix, adapter_name].compact)
+    end
+
+    def config_prefix
+      ".librarian"
+    end
+
     def lockfile_name
       "#{specfile_name}.lock"
     end

data/lib/librarian/manifest.rb

@@ -6,7 +6,37 @@ require 'librarian/support/abstract_method'
 module Librarian
   class Manifest
 
-    class Version < Gem::Version
+    class Version
+      include Comparable
+
+      def initialize(*args)
+        args = initialize_normalize_args(args)
+
+        self.backing = Gem::Version.new(*args)
+      end
+
+      def to_gem_version
+        backing
+      end
+
+      def <=>(other)
+        to_gem_version <=> other.to_gem_version
+      end
+
+      def to_s
+        to_gem_version.to_s
+      end
+
+      private
+
+      def initialize_normalize_args(args)
+        args.map do |arg|
+          arg = [arg] if self.class === arg
+          arg
+        end
+      end
+
+      attr_accessor :backing
     end
 
     include Support::AbstractMethod

data/lib/librarian/mock/environment.rb

@@ -5,8 +5,8 @@ module Librarian
   module Mock
     class Environment < Environment
 
-      def specfile_name
-        "Mockfile"
+      def adapter_name
+        "mock"
       end
 
       def install_path

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/unit/action/install_spec.rb

@@ -94,13 +94,14 @@ module Librarian
             end
           end
 
-          it "should not try to create the install path if it already exists" do
+          it "should recreate the install path if it already exists" do
             action.stub(:sorted_manifests) { sorted_manifests }
             action.stub(:cache_manifests)
             action.stub(:install_manifests)
 
             install_path.stub(:exist?) { true }
-            install_path.should_not_receive(:mkpath)
+            install_path.should_receive(:rmtree)
+            install_path.should_receive(:mkpath)
           end
 
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12899900 !ruby/object:Gem::Requirement
+  requirement: &13668800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12899900
+  version_requirements: *13668800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12899480 !ruby/object:Gem::Requirement
+  requirement: &13668380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12899480
+  version_requirements: *13668380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12899060 !ruby/object:Gem::Requirement
+  requirement: &13667960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12899060
+  version_requirements: *13667960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &12898640 !ruby/object:Gem::Requirement
+  requirement: &13667540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12898640
+  version_requirements: *13667540
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &12898220 !ruby/object:Gem::Requirement
+  requirement: &13667120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12898220
+  version_requirements: *13667120
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &12897800 !ruby/object:Gem::Requirement
+  requirement: &13666700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12897800
+  version_requirements: *13666700
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &12897300 !ruby/object:Gem::Requirement
+  requirement: &13666200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *12897300
+  version_requirements: *13666200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &12896880 !ruby/object:Gem::Requirement
+  requirement: &13665780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12896880
+  version_requirements: *13665780
 description: Librarian
 email:
 - y_feldblum@yahoo.com