librarian-puppet-maestrodev 0.9.9.8 → 0.9.10.1

data/README.md

@@ -170,25 +170,6 @@ Please include:
  * Please run the `librarian-puppet` commands in verbose mode by using the
   `--verbose` flag, and include the verbose output in the bug report as well.
 
-## Changelog
-
-### 0.9.0
-
- * Initial release
-
-### 0.9.1
-
- * Proper error message when a module that is sourced from the forge does not
-   exist.
- * Added support for annotated tags as git references.
- * `librarian-puppet init` adds `.tmp/` to gitignore instead of `tmp/`.
- * Fixed syntax error in the template Puppetfile created by `librarian-puppet
-   init`.
- * Checks for `lib/puppet` as well as `manifests/` when checking if the git
-   repository is a valid module.
- * When a user specifies `<foo>/<bar>` as the name of a module sources from a
-   git repository, assume the module name is actually `<bar>`.
- * Fixed gem description and summary in gemspec.
 
 ## License
 Please see the [LICENSE](https://github.com/rodjek/librarian-puppet/blob/master/LICENSE)

data/lib/librarian/puppet/extension.rb

@@ -102,15 +102,118 @@ module Librarian
     end
   end
 
-  class Resolver
-    # ensure we don't return nil, if manifests is nil we return a resolution that is not valid
-    def resolve(spec, partial_manifests = [])
-      manifests = implementation(spec).resolve(partial_manifests)
-      if manifests
-        enforce_consistency!(spec.dependencies, manifests)
-        manifests = sort(manifests)
-      end
-      Resolution.new(spec.dependencies, manifests)
+  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/source/forge.rb

@@ -152,8 +152,10 @@ module Librarian
           def api_call(module_name)
             debug { "Querying Forge API for module #{name}" }
             base_url = source.uri
+            path     = "api/v1/releases.json?module=#{module_name}"
+            
             begin
-              data = open("#{base_url}/api/v1/releases.json?module=#{module_name}") {|f| f.read}
+              data = open("#{base_url}/#{path}") {|f| f.read}
               JSON.parse(data)
             rescue OpenURI::HTTPError => e
               case e.io.status[0].to_i

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

@@ -125,10 +125,20 @@ module Librarian
               "librarian-puppet v#{Librarian::Puppet::VERSION}"
 
             resp = http.request(request)
-            if resp.code.to_i != 200
+            data = resp.body
+
+            if resp.code.to_i == 403
+              begin
+                message = JSON.parse(data)['message']
+                if message.include? 'API rate limit exceeded'
+                  raise Error, message
+                end
+                rescue JSON::ParserError
+                  # 403 response does not return json, skip.
+              end
+            elsif resp.code.to_i != 200
               nil
             else
-              data = resp.body
               JSON.parse(data)
             end
           end

data/lib/librarian/puppet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet-maestrodev
 version: !ruby/object:Gem::Version
-  version: 0.9.9.8
+  version: 0.9.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet
+  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:
@@ -149,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1093121364581452316
+      hash: -2861496222512018377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1093121364581452316
+      hash: -2861496222512018377
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25