librarian 0.0.9 → 0.0.10

data/lib/librarian/action/update.rb

@@ -0,0 +1,76 @@
+require "librarian/error"
+require "librarian/manifest_set"
+require "librarian/resolver"
+require "librarian/spec_change_set"
+require "librarian/action/base"
+
+module Librarian
+  module Action
+    class Update < Base
+
+      def run
+        unless lockfile_path.exist?
+          raise Error, "Lockfile missing!"
+        end
+        previous_resolution = lockfile.load(lockfile_path.read)
+        partial_manifests = ManifestSet.deep_strip(previous_resolution.manifests, dependency_names)
+        spec = specfile.read(previous_resolution.sources)
+        spec_changes = spec_change_set(spec, previous_resolution)
+        raise Error, "Cannot update when the specfile has been changed." unless spec_changes.same?
+        resolution = resolver.resolve(spec, partial_manifests)
+        unless resolution.correct?
+          raise Error, "Could not resolve the dependencies."
+        else
+          lockfile_text = lockfile.save(resolution)
+          debug { "Bouncing #{lockfile_name}" }
+          bounced_lockfile_text = lockfile.save(lockfile.load(lockfile_text))
+          unless bounced_lockfile_text == lockfile_text
+            debug { "lockfile_text: \n#{lockfile_text}"}
+            debug { "bounced_lockfile_text: \n#{bounced_lockfile_text}"}
+            raise Error, "Cannot bounce #{lockfile_name}!"
+          end
+          lockfile_path.open('wb') { |f| f.write(lockfile_text) }
+        end
+      end
+
+    private
+
+      def dependency_names
+        options[:names]
+      end
+
+      def specfile_name
+        environment.specfile_name
+      end
+
+      def lockfile_name
+        environment.lockfile_name
+      end
+
+      def specfile_path
+        environment.specfile_path
+      end
+
+      def lockfile_path
+        environment.lockfile_path
+      end
+
+      def specfile
+        environment.specfile
+      end
+
+      def lockfile
+        environment.lockfile
+      end
+
+      def resolver
+        Resolver.new(environment)
+      end
+
+      def spec_change_set(spec, lock)
+        SpecChangeSet.new(environment, spec, lock)
+      end
+
+    end
+  end
+end

data/lib/librarian/chef/cli.rb

@@ -2,19 +2,24 @@ require 'librarian/helpers'
 
 require 'librarian/cli'
 require 'librarian/chef'
-require 'librarian/chef/particularity'
 
 module Librarian
   module Chef
     class Cli < Librarian::Cli
 
+      module Particularity
+        def root_module
+          Chef
+        end
+      end
+
       include Particularity
       extend Particularity
 
       source_root Pathname.new(__FILE__).dirname.join("templates")
 
       def init
-        copy_file root_module.specfile_name
+        copy_file environment.specfile_name
       end
 
     end

data/lib/librarian/chef/dsl.rb

@@ -1,13 +1,10 @@
 require 'librarian/dsl'
-require 'librarian/chef/particularity'
 require 'librarian/chef/source'
 
 module Librarian
   module Chef
     class Dsl < Librarian::Dsl
 
-      include Particularity
-
       dependency :cookbook
 
       source :site => Source::Site

data/lib/librarian/chef/environment.rb

@@ -0,0 +1,19 @@
+require "librarian/environment"
+require "librarian/chef/dsl"
+require "librarian/chef/source"
+
+module Librarian
+  module Chef
+    class Environment < Environment
+
+      def specfile_name
+        "Cheffile"
+      end
+
+      def install_path
+        project_path.join("cookbooks")
+      end
+
+    end
+  end
+end

data/lib/librarian/chef/extension.rb

@@ -1,24 +1,9 @@
-require 'librarian/specfile'
-require 'librarian/source'
-require 'librarian/chef/dsl'
-require 'librarian/chef/source'
+require 'librarian/chef/environment'
 
 module Librarian
   module Chef
     extend self
     extend Librarian
 
-    module Overrides
-      def specfile_name
-        'Cheffile'
-      end
-
-      def install_path
-        project_path.join('cookbooks')
-      end
-    end
-
-    extend Overrides
-
   end
 end

data/lib/librarian/chef/integration/knife.rb

@@ -1,13 +1,15 @@
+require 'pathname'
 require 'securerandom'
 require 'highline'
 
 require 'librarian'
+require 'librarian/action/install'
 require 'librarian/chef'
 
 module Librarian
   module Chef
 
-    module KnifeIntegration
+    class Environment
       def install_path
         @install_path ||= begin
           has_home = ENV["HOME"] && File.directory?(ENV["HOME"])
@@ -22,28 +24,19 @@ module Librarian
       end
     end
 
-    extend KnifeIntegration
-
-    def install_consistent_resolution!
-      raise Error, "#{specfile_name} missing!" unless specfile_path.exist?
-      raise Error, "#{lockfile_name} missing!" unless lockfile_path.exist?
+    def install_path
+      environment.install_path
+    end
 
-      previous_resolution = lockfile.load(lockfile_path.read)
-      spec = specfile.read(previous_resolution.sources)
-      spec_changes = spec_change_set(spec, previous_resolution)
-      raise Error, "#{specfile_name} and #{lockfile_name} are out of sync!" unless spec_changes.same?
+    hl = HighLine.new
 
-      previous_resolution.manifests.each do |manifest|
-        manifest.install!
-      end
+    begin
+      Action::Install.new(environment).run
     rescue Error => e
-      hl = HighLine.new
       message = hl.color(e.message, HighLine::RED)
       hl.say(message)
       Process.exit!(1)
     end
 
-    install_consistent_resolution!
-
   end
 end

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

@@ -1,12 +1,10 @@
 require 'librarian/source/git'
 require 'librarian/chef/source/local'
-require 'librarian/chef/particularity'
 
 module Librarian
   module Chef
     module Source
       class Git < Librarian::Source::Git
-        include Particularity
         include Local
       end
     end

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

@@ -1,83 +1,10 @@
-require 'fileutils'
-require 'pathname'
-
-require 'librarian/chef/manifest'
+require 'librarian/chef/source/local/manifest'
 
 module Librarian
   module Chef
     module Source
       module Local
 
-        class Manifest < Manifest
-
-          class << self
-
-            def create(source, dependency, path)
-              new(source, dependency.name, path)
-            end
-
-            def manifest?(dependency, path)
-              path = Pathname.new(path)
-              !!manifest_path(path)
-            end
-
-            def check_manifest(dependency, manifest_path)
-              manifest = read_manifest(dependency.name, manifest_path)
-              manifest["name"] == dependency.name
-            end
-
-          end
-
-          attr_reader :path
-
-          def initialize(source, name, path)
-            super(source, name)
-            @path = Pathname.new(path)
-            @found_path = nil
-          end
-
-          def found_path
-            @found_path ||= source.manifest_search_paths(self).find{|p| self.class.manifest?(self, p)}
-          end
-
-          def manifest
-            @manifest ||= fetch_manifest!
-          end
-
-          def fetch_manifest!
-            expect_manifest
-
-            read_manifest(name, manifest_path(found_path))
-          end
-
-          def fetch_version!
-            manifest['version']
-          end
-
-          def fetch_dependencies!
-            manifest['dependencies']
-          end
-
-          def install!
-            debug { "Installing #{name}-#{version}" }
-            install_path = root_module.install_path.join(name)
-            if install_path.exist?
-              debug { "Deleting #{relative_path_to(install_path)}" }
-              install_path.rmtree
-            end
-            debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
-            FileUtils.cp_r(found_path, install_path)
-          end
-
-        private
-
-          def expect_manifest
-            return if found_path && manifest_path(found_path)
-            raise Error, "No metadata file found for #{name} from #{source}! If this should be a cookbook, you might consider contributing a metadata file upstream or forking the cookbook to add your own metadata file."
-          end
-
-        end
-
         def manifest_class
           Manifest
         end

data/lib/librarian/chef/source/local/manifest.rb

@@ -0,0 +1,82 @@
+require 'fileutils'
+require 'pathname'
+
+require 'librarian/chef/manifest'
+
+module Librarian
+  module Chef
+    module Source
+      module Local
+        class Manifest < Manifest
+
+          class << self
+
+            def create(source, dependency, path)
+              new(source, dependency.name, path)
+            end
+
+            def manifest?(dependency, path)
+              path = Pathname.new(path)
+              !!manifest_path(path)
+            end
+
+            def check_manifest(dependency, manifest_path)
+              manifest = read_manifest(dependency.name, manifest_path)
+              manifest["name"] == dependency.name
+            end
+
+          end
+
+          attr_reader :path
+
+          def initialize(source, name, path)
+            super(source, name)
+            @path = Pathname.new(path)
+            @found_path = nil
+          end
+
+          def found_path
+            @found_path ||= source.manifest_search_paths(self).find{|p| self.class.manifest?(self, p)}
+          end
+
+          def manifest
+            @manifest ||= fetch_manifest!
+          end
+
+          def fetch_manifest!
+            expect_manifest
+
+            read_manifest(name, manifest_path(found_path))
+          end
+
+          def fetch_version!
+            manifest['version']
+          end
+
+          def fetch_dependencies!
+            manifest['dependencies']
+          end
+
+          def install!
+            debug { "Installing #{name}-#{version}" }
+            install_path = environment.install_path.join(name)
+            if install_path.exist?
+              debug { "Deleting #{relative_path_to(install_path)}" }
+              install_path.rmtree
+            end
+            debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
+            FileUtils.cp_r(found_path, install_path)
+          end
+
+        private
+
+          def expect_manifest
+            return if found_path && manifest_path(found_path)
+            raise Error, "No metadata file found for #{name} from #{source}! If this should be a cookbook, you might consider contributing a metadata file upstream or forking the cookbook to add your own metadata file."
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,10 @@
 require 'librarian/source/path'
 require 'librarian/chef/source/local'
-require 'librarian/chef/particularity'
 
 module Librarian
   module Chef
     module Source
       class Path < Librarian::Source::Path
-        include Particularity
         include Local
       end
     end

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

@@ -7,111 +7,31 @@ require 'digest'
 
 require 'librarian/helpers/debug'
 
-require 'librarian/manifest'
-require 'librarian/chef/manifest'
-require 'librarian/chef/particularity'
+require 'librarian/chef/source/site/manifest'
 
 module Librarian
   module Chef
     module Source
       class Site
 
-        class Manifest < Manifest
-
-          attr_reader :version_uri
-          attr_reader :install_path
-
-          def initialize(source, name, version_uri = nil)
-            super(source, name)
-            @version_uri = version_uri
-
-            @cache_path = nil
-            @metadata_cache_path = nil
-            @package_cache_path = nil
-            @install_path = root_module.install_path.join(name)
-
-            @version_metadata = nil
-            @version_manifest = nil
-          end
-
-          def fetch_version!
-            version_metadata['version']
-          end
-
-          def fetch_dependencies!
-            version_manifest['dependencies'].map{|k, v| Dependency.new(k, v, nil)}
-          end
-
-          def version_uri
-            @version_uri ||= begin
-              source.cache!([self])
-              source.manifests(self).find{|m| m.version == version}.version_uri
-            end
-          end
-
-          def version_uri=(version_uri)
-            @version_uri = version_uri
-          end
-
-          def cache_path
-            @cache_path ||= source.version_cache_path(self, version_uri)
-          end
-          def metadata_cache_path
-            @metadata_cache_path ||= cache_path.join('version.json')
-          end
-          def package_cache_path
-            @package_cache_path ||= cache_path.join('package')
-          end
-
-          def version_metadata
-            @version_metadata ||= fetch_version_metadata!
-          end
-
-          def fetch_version_metadata!
-            source.cache_version_metadata!(self, version_uri)
-            JSON.parse(metadata_cache_path.read)
-          end
-
-          def version_manifest
-            @version_manifest ||= fetch_version_manifest!
-          end
-
-          def fetch_version_manifest!
-            source.cache_version_package!(self, version_uri, version_metadata['file'])
-            manifest_path = manifest_path(package_cache_path)
-            read_manifest(name, manifest_path)
-          end
-
-          def install!
-            debug { "Installing #{self}" }
-            version_manifest # make sure it's cached
-            if install_path.exist?
-              debug { "Deleting #{relative_path_to(install_path)}" }
-              install_path.rmtree
-            end
-            package_cache_path = source.version_package_cache_path(self, version_uri)
-            debug { "Copying #{relative_path_to(package_cache_path)} to #{relative_path_to(install_path)}" }
-            FileUtils.cp_r(package_cache_path, install_path)
-          end
-
-        end
-
         include Helpers::Debug
-        include Particularity
 
         class << self
           LOCK_NAME = 'SITE'
           def lock_name
             LOCK_NAME
           end
-          def from_lock_options(options)
-            new(options[:remote], options.reject{|k, v| k == :remote})
+          def from_lock_options(environment, options)
+            new(environment, options[:remote], options.reject{|k, v| k == :remote})
           end
         end
 
+        attr_accessor :environment
+        private :environment=
         attr_reader :uri
 
-        def initialize(uri, options = {})
+        def initialize(environment, uri, options = {})
+          self.environment = environment
           @uri = uri
           @cache_path = nil
         end
@@ -156,13 +76,13 @@ module Librarian
         end
 
         def install_path(dependency)
-          root_module.install_path.join(dependency.name)
+          environment.install_path.join(dependency.name)
         end
 
         def cache_path
           @cache_path ||= begin
             dir = Digest::MD5.hexdigest(uri)
-            root_module.cache_path.join("source/chef/site/#{dir}")
+            environment.cache_path.join("source/chef/site/#{dir}")
           end
         end