librarian-puppet 0.9.3 → 0.9.4

data/.gitignore

@@ -1,3 +1,3 @@
-*.gem
+pkg/
 Gemfile.lock
 tmp/

data/lib/librarian/puppet.rb

@@ -1,5 +1,6 @@
 require 'librarian'
 require 'puppet'
+require 'fileutils'
 
 require 'librarian/puppet/extension'
 require 'librarian/puppet/version'

data/lib/librarian/puppet/cli.rb

@@ -43,6 +43,7 @@ module Librarian
       option "strip-dot-git", :type => :boolean
       option "path", :type => :string
       option "destructive", :type => :boolean, :default => false
+      option "local", :type => :boolean, :default => false
       def install
         ensure!
         clean! if options["clean"]
@@ -56,10 +57,26 @@ module Librarian
         if options.include?("path")
           environment.config_db.local["path"] = options["path"]
         end
+
+        environment.config_db.local['mode'] = options['local'] ? 'local' : nil
+
         resolve!
         install!
       end
 
+      desc "package", "Cache the puppet modules in vendor/puppet/cache."
+      option "quiet", :type => :boolean, :default => false
+      option "verbose", :type => :boolean, :default => false
+      option "line-numbers", :type => :boolean, :default => false
+      option "clean", :type => :boolean, :default => false
+      option "strip-dot-git", :type => :boolean
+      option "path", :type => :string
+      option "destructive", :type => :boolean, :default => false
+      def package
+        environment.vendor!
+        install
+      end
+
       def version
         say "librarian-puppet v#{Librarian::Puppet::VERSION}"
       end

data/lib/librarian/puppet/environment.rb

@@ -16,6 +16,18 @@ module Librarian
         project_path.join(part)
       end
 
+      def vendor_path
+        project_path.join('vendor/puppet')
+      end
+
+      def vendor_cache
+        vendor_path.join('cache')
+      end
+
+      def vendor_source
+        vendor_path.join('source')
+      end
+
       def cache_path
         project_path.join(".tmp/librarian/cache")
       end
@@ -23,6 +35,20 @@ module Librarian
       def scratch_path
         project_path.join(".tmp/librarian/scratch")
       end
+
+      def vendor!
+        vendor_cache.mkpath  unless vendor_cache.exist?
+        vendor_source.mkpath unless vendor_source.exist?
+      end
+
+      def vendor?
+        vendor_path.exist?
+      end
+
+      def local?
+        config_db['mode'] == 'local'
+      end
+
     end
   end
 end

data/lib/librarian/puppet/source/forge.rb

@@ -37,6 +37,14 @@ module Librarian
           end
 
           def install_version!(version, install_path)
+            if environment.local? && !vendored?(name, version)
+              raise Error, "Could not find a local copy of #{name} at #{version}."
+            end
+
+            if environment.vendor?
+              vendor_cache(name, version) unless vendored?(name, version)
+            end
+
             cache_version_unpacked! version
 
             if install_path.exist?
@@ -69,7 +77,41 @@ module Librarian
 
             path.mkpath
 
-            output = `puppet module install -i #{path.to_s} --modulepath #{path.to_s} --ignore-dependencies #{name} 2>&1`
+            target = vendored?(name, version) ? vendored_path(name, version) : name
+
+            `puppet module install --target-dir #{path} --modulepath #{path} --ignore-dependencies #{target}`
+          end
+
+          def vendored?(name, version)
+            vendored_path(name, version).exist?
+          end
+
+          def vendored_path(name, version)
+            environment.vendor_cache.join("#{name.sub("/", "-")}-#{version}.tar.gz")
+          end
+
+          def vendor_cache(name, version)
+            File.open(vendored_path(name, version).to_s, 'w') do |f|
+              download(name, version) do |data|
+                f << data
+              end
+            end
+          end
+
+          def download(name, version, &block)
+            data = api_call("api/v1/releases.json?module=#{name}&version=#{version}")
+
+            info = data[name].detect {|h| h['version'] == version.to_s }
+
+            stream(info['file'], &block)
+          end
+
+          def stream(file, &block)
+            Net::HTTP.get_response(URI.parse("#{source}#{file}")) do |res|
+              res.code
+
+              res.read_body(&block)
+            end
           end
 
         private

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

@@ -14,6 +14,38 @@ module Librarian
           command = %W(rev-parse #{reference}^{commit} --quiet)
           run!(command, :chdir => true).strip
         end
+
+        # Naming this method 'version' causes an exception to be raised.
+        def module_version
+          return '0.0.1' unless modulefile?
+
+          metadata  = ::Puppet::ModuleTool::Metadata.new
+          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+
+          metadata.version
+        end
+
+        def dependencies
+          return {} unless modulefile?
+
+          metadata = ::Puppet::ModuleTool::Metadata.new
+
+          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+
+          metadata.dependencies.inject({}) do |h, dependency|
+            name = dependency.instance_variable_get(:@full_module_name)
+            version = dependency.instance_variable_get(:@version_requirement)
+            h.update(name => version)
+          end
+        end
+
+        def modulefile
+          File.join(path, 'Modulefile')
+        end
+
+        def modulefile?
+          File.exists?(modulefile)
+        end
       end
     end
   end
@@ -22,6 +54,60 @@ module Librarian
     module Source
       class Git < Librarian::Source::Git
         include Local
+
+        def cache!
+          return vendor_checkout! if vendor_cached?
+
+          if environment.local?
+            raise Error, "Could not find a local copy of #{uri} at #{sha}."
+          end
+
+          super
+
+          cache_in_vendor(repository.path) if environment.vendor?
+        end
+
+        def vendor_tgz
+          environment.vendor_source + "#{sha}.tar.gz"
+        end
+
+        def vendor_cached?
+          vendor_tgz.exist?
+        end
+
+        def vendor_checkout!
+          repository.path.rmtree if repository.path.exist?
+          repository.path.mkpath
+
+          Dir.chdir(repository.path.to_s) do
+            %x{tar xzf #{vendor_tgz}}
+          end
+
+          repository_cached!
+        end
+
+        def cache_in_vendor(tmp_path)
+          Dir.chdir(tmp_path.to_s) do
+            %x{git archive #{sha} | gzip > #{vendor_tgz}}
+          end
+        end
+
+        def fetch_version(name, extra)
+          cache!
+          found_path = found_path(name)
+          repository.module_version
+        end
+
+        def fetch_dependencies(name, version, extra)
+          repository.dependencies.map do |k, v|
+            Dependency.new(k, v, forge_source)
+          end
+        end
+
+        def forge_source
+          Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
+        end
+
       end
     end
   end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: librarian-puppet
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Tim Sharpe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-10 00:00:00 +10:00
+date: 2012-08-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency