librarian-puppet-maestrodev 0.9.11.4 → 0.9.11.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDM5ZTU0ZTljMjZmY2M3MjljOTZjOTY5YzUzNDVhOWQ4ZGJhMDFkYw==
+  data.tar.gz: !binary |-
+    Zjk3ZWQxNjhlMzg4MWFiYTlmYjMxOGQ1ZjYxMjg1YmU3ZmQ3ZDE5NA==
+SHA512:
+  metadata.gz: !binary |-
+    YmI4NDRmM2U2NWJhOTM5NzM4OTYzYmM4N2UxY2YwYTg4MWVhMmJlMWRlMzJi
+    NzhhODdkZWZiYTIxMjY5OGYwMDM1ZTI3ZjA5Nzc4NThmN2EwOGY1MzFlZjQ3
+    N2U1YmM1NzAxNDJkZjkzNzkwNzgyMjYyZWU1YzkwNDMyMWJmYTE=
+  data.tar.gz: !binary |-
+    YTU1NmQ1NTMyYWE5M2U4YTJkODkxMmMzZDNmZWQ5ZjZlYmFkNjg3MGFmZWNl
+    NGNmYzlmY2JiNGQ5Y2VkOGNjZmFlMzYzZjdkYjY4YjEyZTY4MGUzMDNkOGQ0
+    Y2NkOTJjZTIxMDY2YTQ5ZWEzYTFkNzZkZDg0YTMyNjJjYTZiMDc=

data/lib/librarian/puppet.rb

@@ -1,7 +1,18 @@
 require 'librarian'
 require 'fileutils'
 require 'open3'
-require 'open3_backport' if RUBY_VERSION < '1.9'
+
+# require open3_backport in ruby 1.8 and install if not present
+# https://github.com/rodjek/librarian-puppet/issues/167
+if RUBY_VERSION < '1.9'
+  begin
+    require 'open3_backport'
+  rescue LoadError
+    require 'rubygems/dependency_installer.rb'
+    Gem::DependencyInstaller.new.install 'open3_backport'
+    require 'open3_backport'
+  end
+end
 
 status = nil
 out = nil

data/lib/librarian/puppet/extension.rb

@@ -5,11 +5,8 @@ module Librarian
   module Puppet
     extend self
     extend Librarian
-
   end
-end
 
-module Librarian
   class Dependency
     class Requirement
       def initialize(*args)
@@ -38,7 +35,6 @@ module Librarian
     def hash
       self.to_s.hash
     end
-
   end
 
   # Fixes for librarian not yet released in their gem
@@ -71,189 +67,6 @@ module Librarian
     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
-
-  # 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
 

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

@@ -19,7 +19,11 @@ module Librarian
           def versions
             return @versions if @versions
             @versions = api_data[name].map { |r| r['version'] }.reverse
-            debug { "  Module #{name} found versions: #{@versions.join(", ")}" }
+            if @versions.empty?
+              info { "No versions found for module #{name}" }
+            else
+              debug { "  Module #{name} found versions: #{@versions.join(", ")}" }
+            end
             @versions
           end
 
@@ -136,6 +140,9 @@ module Librarian
           def debug(*args, &block)
             environment.logger.debug(*args, &block)
           end
+          def info(*args, &block)
+            environment.logger.info(*args, &block)
+          end
 
         private
           def api_data

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

@@ -1,5 +1,6 @@
 require 'uri'
 require 'net/https'
+require 'open-uri'
 require 'json'
 
 require 'librarian/puppet/version'
@@ -98,7 +99,20 @@ module Librarian
 
             url = "https://api.github.com/repos/#{name}/tarball/#{version}"
             url << "?access_token=#{ENV['GITHUB_API_TOKEN']}" if ENV['GITHUB_API_TOKEN']
-            `curl #{url} -o #{vendored_path(name, version).to_s} -L 2>&1`
+
+            File.open(vendored_path(name, version).to_s, 'wb') do |f|
+              begin
+                debug { "Downloading <#{url}> to <#{f.path}>" }
+                open(url,
+                  "User-Agent" => "librarian-puppet v#{Librarian::Puppet::VERSION}") do |res|
+                  while buffer = res.read(8192)
+                    f.write(buffer)
+                  end
+                end
+              rescue OpenURI::HTTPError => e
+                raise e, "Error requesting <#{url}>: #{e.to_s}"
+              end
+            end
           end
 
           def clean_up_old_cached_versions(name)
@@ -107,6 +121,10 @@ module Librarian
             end
           end
 
+          def debug(*args, &block)
+            environment.logger.debug(*args, &block)
+          end
+
         private
 
           def api_call(path)

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.11.4"
+    VERSION = "0.9.11.5"
   end
 end

metadata

@@ -1,104 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.11.4
-  prerelease: 
+  version: 0.9.11.5
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
-  requirement: &13791080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *13791080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13790320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13790320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13789840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13789840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &13789160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13789160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &13788500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13788500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &13787560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13787560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &13786380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
-  version_requirements: *13786380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &13785900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13785900
+  version_requirements: !ruby/object:Gem::Requirement
+    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:
@@ -113,49 +136,42 @@ files:
 - README.md
 - bin/librarian-puppet
 - lib/librarian/puppet.rb
-- lib/librarian/puppet/dsl.rb
-- lib/librarian/puppet/source.rb
-- lib/librarian/puppet/lockfile/parser.rb
 - lib/librarian/puppet/cli.rb
+- lib/librarian/puppet/dsl.rb
 - lib/librarian/puppet/environment.rb
-- lib/librarian/puppet/requirement.rb
-- lib/librarian/puppet/version.rb
-- lib/librarian/puppet/templates/Puppetfile
 - lib/librarian/puppet/extension.rb
+- lib/librarian/puppet/lockfile/parser.rb
+- lib/librarian/puppet/requirement.rb
+- lib/librarian/puppet/source.rb
 - lib/librarian/puppet/source/forge.rb
-- lib/librarian/puppet/source/githubtarball.rb
 - lib/librarian/puppet/source/git.rb
-- lib/librarian/puppet/source/path.rb
+- lib/librarian/puppet/source/githubtarball.rb
 - lib/librarian/puppet/source/local.rb
+- lib/librarian/puppet/source/path.rb
+- lib/librarian/puppet/templates/Puppetfile
+- lib/librarian/puppet/version.rb
 homepage: https://github.com/rodjek/librarian-puppet
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1121016427067357910
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1121016427067357910
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bundler for your Puppet modules
 test_files: []