librarian-puppet-maestrodev 0.9.10.1 → 0.9.11.1

data/README.md

@@ -1,12 +1,11 @@
 # Librarian-puppet
 
-## Note
+[![Build Status](https://travis-ci.org/maestrodev/librarian-puppet.png?branch=maestrodev)](https://travis-ci.org/maestrodev/librarian-puppet)
 
-This is a fork of [rodjek librarian-puppet](https://github.com/rodjek/librarian-puppet) with
-a bunch of fixes submitted as pull requests there.
-It is published to rubygems as [librarian-puppet-maestrodev](https://rubygems.org/gems/librarian-puppet-maestrodev)
-so you can easily try it.
+## Note
 
+This is a fork of [rodjek librarian-puppet](https://github.com/rodjek/librarian-puppet) to publish to rubygems
+[librarian-puppet-maestrodev](https://rubygems.org/gems/librarian-puppet-maestrodev)
 
 ## Introduction
 
@@ -30,6 +29,15 @@ Every Puppet repository that uses Librarian-puppet will have a file named
 `Puppetfile` in the root directory of that repository.  The full specification
 for which modules your puppet infrastructure repository  depends goes in here.
 
+### Simple Puppetfile
+
+This Puppetfile will download all the dependencies listed in your Modulefile from the Puppet Forge
+
+    forge "http://forge.puppetlabs.com"
+
+    modulefile
+
+
 ### Example Puppetfile
 
     forge "http://forge.puppetlabs.com"

data/lib/librarian/puppet/cli.rb

@@ -45,6 +45,12 @@ module Librarian
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
       def install
+
+        unless File.exist?('Puppetfile')
+          say "Could not find Puppetfile in #{Dir.pwd}", :red
+          exit 1
+        end
+
         ensure!
         clean! if options["clean"]
         unless options["destructive"].nil?

data/lib/librarian/puppet/dsl.rb

@@ -14,3 +14,16 @@ module Librarian
     end
   end
 end
+
+module Librarian
+  class Dsl
+    class Receiver
+      def modulefile
+        File.read('Modulefile').lines.each do |line|
+          regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
+          regexp =~ line && mod($2, $4)
+        end
+      end
+    end
+  end
+end

data/lib/librarian/puppet/extension.rb

@@ -216,4 +216,186 @@ module Librarian
     end
   end
 
+  # Fixes for librarian not yet released in their gem
+  module Mock
+    module Source
+      class Mock
+        alias :eql? :==
+
+        def hash
+          self.to_s.hash
+        end
+      end
+    end
+  end
+  module Source
+    class Git
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+    end
+
+    class Path
+      alias :eql? :==
+
+      def hash
+        self.to_s.hash
+      end
+    end
+  end
+
+
+  module Action
+    class Install < Base
+
+    private
+
+      def create_install_path
+        install_path.rmtree if install_path.exist? && destructive?
+        install_path.mkpath
+      end
+
+      def destructive?
+        environment.config_db.local['destructive'] == 'true'
+      end
+    end
+  end
+
+  class ManifestSet
+    private
+
+    # Check if module doesn't exist and fail fast
+    def dependencies_of(names)
+      names = Array === names ? names.dup : names.to_a
+      assert_strings!(names)
+
+      deps = Set.new
+      until names.empty?
+        name = names.shift
+        next if deps.include?(name)
+
+        deps << name
+        raise(Error, "Unable to find module #{name}") if index[name].nil?
+        names.concat index[name].dependencies.map(&:name)
+      end
+      deps.to_a
+    end
+  end
+
+  class Manifest
+
+    class PreReleaseVersion
+
+      # Compares pre-release component ids using Semver 2.0.0 spec
+      def self.compare_components(this_id,other_id)
+        case # Strings have higher precedence than numbers
+          when (this_id.is_a?(Integer) and other_id.is_a?(String))
+            -1
+          when (this_id.is_a?(String) and other_id.is_a?(Integer))
+            1
+          else
+            this_id <=> other_id
+        end
+      end
+
+      # Parses pre-release components `a.b.c` into an array ``[a,b,c]`
+      # Converts numeric components into +Integer+
+      def self.parse(prerelease)
+        if prerelease.nil?
+          []
+        else
+          prerelease.split('.').collect do |id|
+            id = Integer(id) if /^[0-9]+$/ =~ id
+            id
+          end
+        end
+      end
+
+      include Comparable
+
+      attr_reader :components
+
+      def initialize(prerelease)
+        @prerelease = prerelease
+        @components = PreReleaseVersion.parse(prerelease)
+      end
+
+      def to_s
+        @prerelease
+      end
+
+      def <=>(other)
+        # null-fill zip array to prevent loss of components
+        z = Array.new([components.length,other.components.length])
+
+        # Compare each component against the other
+        comp = z.zip(components,other.components).collect do |ids|
+          case # All components being equal, the version with more of them takes precedence
+            when ids[1].nil? # Self has less elements, other wins
+              -1
+            when ids[2].nil? # Other has less elements, self wins
+              1
+            else
+              PreReleaseVersion.compare_components(ids[1],ids[2])
+          end
+        end
+        # Chose the first non-zero comparison or return 0
+        comp.delete_if {|c| c == 0}[0] || 0
+      end
+    end
+    class Version
+      @@SEMANTIC_VERSION_PATTERN = /^([0-9]+\.[0-9]+(?:\.[0-9]+)?)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
+      def self.parse_semver(version_string)
+        parsed = @@SEMANTIC_VERSION_PATTERN.match(version_string.strip)
+        if parsed
+          {
+            :full_version => parsed[0],
+            :version => parsed[1],
+            :prerelease => (PreReleaseVersion.new(parsed[2]) if parsed[2]),
+            :build => parsed[3]
+          }
+        end
+      end
+
+      attr_reader :prerelease
+
+      def initialize(*args)
+        args = initialize_normalize_args(args)
+        semver = Version.parse_semver(*args)
+        if semver
+          self.backing  = Gem::Version.new(semver[:version])
+          @prerelease   = semver[:prerelease]
+          @full_version = semver[:full_version]
+        else
+          self.backing  = Gem::Version.new(*args)
+          @full_version = to_gem_version.to_s
+        end
+      end
+
+      def <=>(other)
+        cmp = to_gem_version <=> other.to_gem_version
+
+        # Should compare pre-release versions?
+        if cmp == 0 and not (prerelease.nil? and other.prerelease.nil?)
+          case # Versions without prerelease take precedence
+            when (prerelease.nil? and not other.prerelease.nil?)
+              1
+            when (not prerelease.nil? and other.prerelease.nil?)
+              -1
+            else
+              prerelease <=> other.prerelease
+          end
+        else
+          cmp
+        end
+      end
+
+      def to_s
+        @full_version
+      end
+    end
+  end
+
 end

data/lib/librarian/puppet/requirement.rb

@@ -4,7 +4,7 @@ module Librarian
       attr_reader :requirement
 
       def initialize(requirement)
-        @requirement = requirement
+        @requirement = requirement || ">=0"
       end
 
       # convert Puppet versions to gem supported versions

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

@@ -18,10 +18,8 @@ module Librarian
 
           def versions
             return @versions if @versions
-            versions = api_data[name].map { |r| r['version'] }.reverse
-            debug { "  Module #{name} found versions: #{versions.join(", ")}" }
-            versions.select { |v| ! Gem::Version.correct? v }.each { |v| debug { "Ignoring invalid version '#{v}' for module #{name}" } }
-            @versions = versions.select { |v| Gem::Version.correct? v }
+            @versions = api_data[name].map { |r| r['version'] }.reverse
+            debug { "  Module #{name} found versions: #{@versions.join(", ")}" }
             @versions
           end
 
@@ -104,6 +102,7 @@ module Librarian
               path.unlink
               raise Error, "Error executing puppet module install:\n#{command}\nError:\n#{output}"
             end
+
           end
 
           def check_puppet_module_options
@@ -209,11 +208,6 @@ module Librarian
           self.class == other.class &&
           self.uri == other.uri
         end
-        alias eql? ==
-
-        def hash
-          self.uri.hash
-        end
 
         alias :eql? :==
 
@@ -275,14 +269,9 @@ module Librarian
         end
 
         def fetch_dependencies(name, version, version_uri)
-          environment.logger.debug { "      Fetching dependencies for #{name} #{version}" }
           repo(name).dependencies(version).map do |k, v|
-            begin
-              v = Requirement.new(v).gem_requirement
-              Dependency.new(k, v, nil)
-            rescue ArgumentError => e
-              raise Error, "Error fetching dependency for #{name} [#{version}]: #{k} [#{v}]: #{e}"
-            end
+            v = Requirement.new(v).gem_requirement
+            Dependency.new(k, v, nil)
           end
         end
 

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

@@ -14,51 +14,6 @@ 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? or puppetfile?
-          
-          if modulefile?
-            metadata = ::Puppet::ModuleTool::Metadata.new
-
-            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-            metadata.dependencies.map do |dependency|
-              name = dependency.instance_variable_get(:@full_module_name)
-              version = dependency.instance_variable_get(:@version_requirement) || ">=0"
-              v = Librarian::Puppet::Requirement.new(version).gem_requirement
-              Dependency.new(name, v, forge_source)
-            end
-          elsif puppetfile?
-            Librarian::Puppet::Environment.new(:project_path => path).specfile.read.dependencies
-          end
-        end
-
-        def modulefile
-          File.join(path, 'Modulefile')
-        end
-
-        def modulefile?
-          File.exists?(modulefile)
-        end
-        
-        def puppetfile?
-          File.exists?(File.join(path, 'Puppetfile'))
-        end
-
-        def forge_source
-          Librarian::Puppet::Source::Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
-        end
       end
     end
   end
@@ -108,19 +63,52 @@ module Librarian
         def fetch_version(name, extra)
           cache!
           found_path = found_path(name)
-          v = repository.module_version
-          v = v.gsub("-",".") # fix for some invalid versions like 1.0.0-rc1
+          module_version
+        end
 
-          # if still not valid, use some default version
-          unless Gem::Version.correct? v
-            debug { "Ignoring invalid version '#{v}' for module #{name}, using 0.0.1" }
-            v = '0.0.1'
+        def fetch_dependencies(name, version, extra)
+          dependencies.map do |k, v|
+            v = Requirement.new(v).gem_requirement
+            Dependency.new(k, v, forge_source)
           end
-          v
         end
 
-        def fetch_dependencies(name, version, extra)
-          repository.dependencies
+        def forge_source
+          Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
+        end
+
+        private
+
+        # 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(filesystem_path, 'Modulefile')
+        end
+
+        def modulefile?
+          File.exists?(modulefile)
         end
 
       end

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

@@ -9,6 +9,7 @@ module Librarian
     module Source
       class GitHubTarball
         class Repo
+          TOKEN_KEY = 'GITHUB_API_TOKEN'
 
           attr_accessor :source, :name
           private :source=, :name=
@@ -24,11 +25,7 @@ module Librarian
               raise Error, "Unable to find module '#{source.uri}' on https://github.com"
             end
 
-            all_versions = data.map { |r| r['name'] }.sort.reverse
-
-            all_versions = all_versions.map do |version|
-              version.gsub(/^v/, '')
-            end
+            all_versions = data.map { |r| r['name'].gsub(/^v/, '') }.sort.reverse
 
             all_versions.delete_if do |version|
               version !~ /\A\d\.\d(\.\d.*)?\z/
@@ -114,34 +111,35 @@ module Librarian
 
           def api_call(path)
             url = "https://api.github.com#{path}"
-            url << "?access_token=#{ENV['GITHUB_API_TOKEN']}" if ENV['GITHUB_API_TOKEN']
-            uri = URI.parse(url)
-            http = Net::HTTP.new(uri.host, uri.port)
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            request = Net::HTTP::Get.new(uri.request_uri)
-
-            request.add_field "User-Agent",
-              "librarian-puppet v#{Librarian::Puppet::VERSION}"
-
-            resp = http.request(request)
-            data = resp.body
+            url << "?access_token=#{ENV[TOKEN_KEY]}" if ENV[TOKEN_KEY]
+            code, data = http_get(url, :headers => {
+              "User-Agent" => "librarian-puppet v#{Librarian::Puppet::VERSION}"
+            })
 
-            if resp.code.to_i == 403
+            if code == 200
+              JSON.parse(data)
+            elsif code == 403
               begin
                 message = JSON.parse(data)['message']
-                if message.include? 'API rate limit exceeded'
-                  raise Error, message
+                if message && message.include?('API rate limit exceeded')
+                  raise Error, message + " -- increase limit by authenticating via #{TOKEN_KEY}=your-token"
                 end
-                rescue JSON::ParserError
-                  # 403 response does not return json, skip.
+              rescue JSON::ParserError
+                # 403 response does not return json, skip.
               end
-            elsif resp.code.to_i != 200
-              nil
-            else
-              JSON.parse(data)
             end
           end
+
+          def http_get(url, options)
+            uri = URI.parse(url)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            request = Net::HTTP::Get.new(uri.request_uri)
+            options[:headers].each { |k, v| request.add_field k, v }
+            resp = http.request(request)
+            [resp.code.to_i, resp.body]
+          end
         end
 
         class << self

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

@@ -41,7 +41,7 @@ module Librarian
 
         def install_perform_step_copy!(found_path, install_path)
           debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
-          FileUtils.cp_r(found_path, install_path)
+          FileUtils.cp_r(found_path, install_path, :preserve => true)
         end
 
         def manifest?(name, path)

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
 forge "http://forge.puppetlabs.com"
 
 # mod 'puppetlabs/stdlib'

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.10.1"
+    VERSION = "0.9.11.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.10.1
+  version: 0.9.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -123,6 +123,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Simplify deployment of your Puppet infrastructure by\n  automatically
   pulling in modules from the forge and git repositories with\n  a single command."
 email:
@@ -152,7 +184,8 @@ files:
 - lib/librarian/puppet/source/path.rb
 - lib/librarian/puppet/source/local.rb
 homepage: https://github.com/rodjek/librarian-puppet
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -165,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2861496222512018377
+      hash: -3890518888719605347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2861496222512018377
+      hash: -3890518888719605347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25