librarian-puppet 0.0.1.pre → 0.0.1.pre2

data/lib/librarian/puppet.rb

@@ -2,6 +2,6 @@ require 'librarian/puppet/extension'
 
 module Librarian
   module Puppet
-    VERSION = "0.0.1.pre"
+    VERSION = "0.0.1.pre2"
   end
 end

data/lib/librarian/puppet/cli.rb

@@ -20,6 +20,19 @@ module Librarian
 
       def init
         copy_file environment.specfile_name
+
+        if File.exists? ".gitignore"
+          gitignore = File.read('.gitignore').split("\n")
+        else
+          gitignore = []
+        end
+
+        gitignore << "tmp/" unless gitignore.include? "tmp/"
+        gitignore << "modules/" unless gitignore.include? "modules/"
+
+        File.open(".gitignore", 'w') do |f|
+          f.puts gitignore.join("\n")
+        end
       end
 
       def version

data/lib/librarian/puppet/dsl.rb

@@ -7,6 +7,7 @@ module Librarian
 
       dependency :mod
 
+      source :forge => Source::Forge
       source :git => Source::Git
       source :path => Source::Path
     end

data/lib/librarian/puppet/environment.rb

@@ -13,6 +13,14 @@ module Librarian
       def install_path
         project_path.join("modules")
       end
+
+      def cache_path
+        project_path.join(".tmp/librarian/cache")
+      end
+
+      def scratch_path
+        project_path.join(".tmp/librarian/scratch")
+      end
     end
   end
 end

data/lib/librarian/puppet/source.rb

@@ -1,2 +1,3 @@
 require 'librarian/puppet/source/path'
 require 'librarian/puppet/source/git'
+require 'librarian/puppet/source/forge'

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

@@ -0,0 +1,204 @@
+require 'uri'
+require 'net/http'
+require 'json'
+require 'librarian/helpers/debug'
+
+module Librarian
+  module Puppet
+    module Source
+      class Forge
+        include Helpers::Debug
+        class Repo
+
+          include Helpers::Debug
+          attr_accessor :source, :name
+          private :source=, :name=
+
+          def initialize(source, name)
+            self.source = source
+            self.name = name
+          end
+
+          def versions
+            data = api_call("#{name}.json")
+            data['releases'].map { |r| r['version'] }.sort.reverse
+          end
+
+          def dependencies(version)
+            data = api_call("api/v1/releases.json?module=#{name}&version=#{version}")
+            data[name].first['dependencies']
+          end
+
+          def manifests
+            versions.map do |version|
+              Manifest.new(source, name, version)
+            end
+          end
+
+          def install_version!(version, install_path)
+            cache_version_unpacked! version
+
+            if install_path.exist?
+              debug { "Deleting #{relative_path_to(install_path)}" }
+              install_path.rmtree
+            end
+
+            unpacked_path = version_unpacked_cache_path(version).join(name.split('/').last)
+            debug { "Copying #{relative_path_to(unpacked_path)} to #{relative_path_to(install_path)}" }
+            FileUtils.cp_r(unpacked_path, install_path)
+          end
+
+          def environment
+            source.environment
+          end
+
+          def cache_path
+            @cache_path ||= source.cache_path.join(name)
+          end
+
+          def version_unpacked_cache_path(version)
+            cache_path.join('version').join(hexdigest(version.to_s))
+          end
+
+          def hexdigest(value)
+            Digest::MD5.hexdigest(value)
+          end
+
+          def cache_version_unpacked!(version)
+            path = version_unpacked_cache_path(version)
+            return if path.directory?
+
+            path.mkpath
+
+            output = `puppet module install -i #{path.to_s} --modulepath #{path.to_s} --ignore-dependencies #{name} 2>&1`
+            debug { output }
+          end
+
+        private
+
+          def api_call(path)
+            base_url = source.to_s
+            resp = Net::HTTP.get_response(URI.parse("#{base_url}/#{path}"))
+            data = resp.body
+
+            JSON.parse(data)
+          end
+        end
+
+        class << self
+          LOCK_NAME = 'FORGE'
+
+          def lock_name
+            LOCK_NAME
+          end
+
+          def from_lock_options(environment, options)
+            new(environment, options[:remote], options.reject { |k, v| k == :remote })
+          end
+
+          def from_spec_args(environment, uri, options)
+            recognised_options = []
+            unrecognised_options = options.keys - recognised_options
+            unless unrecognised_options.empty?
+              raise Error, "unrecognised options: #{unrecognised_options.join(", ")}"
+            end
+
+            new(environment, uri, options)
+          end
+        end
+
+        attr_accessor :environment
+        private :environment=
+        attr_reader :uri
+
+        def initialize(environment, uri, options = {})
+          self.environment = environment
+          @uri = uri
+          @cache_path = nil
+        end
+
+        def to_s
+          uri
+        end
+
+        def ==(other)
+          other &&
+          self.class == other.class &&
+          self.uri == other.uri
+        end
+
+        def to_spec_args
+          [uri, {}]
+        end
+
+        def to_lock_options
+          {:remote => uri}
+        end
+
+        def pinned?
+          false
+        end
+
+        def unpin!
+        end
+
+        def install!(manifest)
+          manifest.source == self or raise ArgumentError
+
+          name = manifest.name
+          version = manifest.version
+          install_path = install_path(name)
+          repo = repo(name)
+
+          debug { "Installing #{manifest}" }
+
+          repo.install_version! version, install_path
+        end
+
+        def manifest(name, version, dependencies)
+          manifest = Manifest.new(self, name)
+          manifest.version = version
+          manifest.dependencies = dependencies
+          manifest
+        end
+
+        def cache_path
+          @cache_path ||= begin
+            dir = Digest::MD5.hexdigest(uri)
+            environment.cache_path.join("source/puppet/forge/#{dir}")
+          end
+        end
+
+        def install_path(name)
+          environment.install_path.join(name.split('/').last)
+        end
+
+        def fetch_version(name, version_uri)
+          versions = repo(name).versions
+          if versions.include? version_uri
+            version_uri
+          else
+            versions.first
+          end
+        end
+
+        def fetch_dependencies(name, version, version_uri)
+          repo(name).dependencies(version).map do |k, v|
+            Dependency.new(k, v, nil)
+          end
+        end
+      
+        def manifests(name)
+          repo(name).manifests
+        end
+
+      private
+
+        def repo(name)
+          @repo ||= {}
+          @repo[name] ||= Repo.new(self, name)
+        end
+      end
+    end
+  end
+end

data/librarian-puppet.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     'lib/librarian/puppet/environment.rb',
     'lib/librarian/puppet/extension.rb',
     'lib/librarian/puppet/source.rb',
+    'lib/librarian/puppet/source/forge.rb',
     'lib/librarian/puppet/source/git.rb',
     'lib/librarian/puppet/source/local.rb',
     'lib/librarian/puppet/source/path.rb',

data/vendor/librarian/lib/librarian/lockfile/parser.rb

@@ -35,18 +35,18 @@ module Librarian
           source_type_name = lines.shift
           source[:type] = source_type_names_map[source_type_name]
           options = {}
-          while lines.first =~ /^ {2}([\w-]+):\s+(.+)$/
+          while lines.first =~ /^ {2}([\w\/-]+):\s+(.+)$/
             lines.shift
             options[$1.to_sym] = $2
           end
           source[:options] = options
           lines.shift # specs
           manifests = {}
-          while lines.first =~ /^ {4}([\w-]+) \((.*)\)$/
+          while lines.first =~ /^ {4}([\w\/-]+) \((.*)\)$/
             lines.shift
             name = $1
             manifests[name] = {:version => $2, :dependencies => {}}
-            while lines.first =~ /^ {6}([\w-]+) \((.*)\)$/
+            while lines.first =~ /^ {6}([\w\/-]+) \((.*)\)$/
               lines.shift
               manifests[name][:dependencies][$1] = $2.split(/,\s*/)
             end
@@ -58,7 +58,7 @@ module Librarian
         manifests_index = Hash[manifests.map{|m| [m.name, m]}]
         raise StandardError, "Expected DEPENDENCIES topic!" unless lines.shift == "DEPENDENCIES"
         dependencies = []
-        while lines.first =~ /^ {2}([\w-]+)(?: \((.*)\))?$/
+        while lines.first =~ /^ {2}([\w\/-]+)(?: \((.*)\))?$/
           lines.shift
           name, requirement = $1, $2.split(/,\s*/)
           dependencies << Dependency.new(name, requirement, manifests_index[name].source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70331391132760 !ruby/object:Gem::Requirement
+  requirement: &70256438580160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *70331391132760
+  version_requirements: *70256438580160
 description: another placeholder!
 email:
 - tim@sharpe.id.au
@@ -40,6 +40,7 @@ files:
 - lib/librarian/puppet/environment.rb
 - lib/librarian/puppet/extension.rb
 - lib/librarian/puppet/source.rb
+- lib/librarian/puppet/source/forge.rb
 - lib/librarian/puppet/source/git.rb
 - lib/librarian/puppet/source/local.rb
 - lib/librarian/puppet/source/path.rb