puppetfiler 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1c257dcdc2214a28481fd05e14520dfcb4f802
-  data.tar.gz: c01f31d32b79d677bdc37cb28f073c64a187ced9
+  metadata.gz: f6301c789d65bd3d6df07b2b05916b1f4503b29a
+  data.tar.gz: 94ddb535dd4ecdd9f310fb86ebf4e260201c473b
 SHA512:
-  metadata.gz: c66f4ad13a3d8677b0f245d22c7438f831ee98e9ee1522157b95e1529e182ce747c520da6fdfe5b5cbceb19ab0bcd362c25eb738c9a257a7f1d7272d824c7cb4
-  data.tar.gz: a92e7bf432ae3426bb28e3c159e7b2bdfa0b72c61800312623d7fe30e5928707fe67b0db4bc1d19e7700cd47a06a6889d846af89ced2f60ec41e75ebb7372156
+  metadata.gz: 465a8428eac7ebba4d34b6c8101cf9176e9fb9689b0f9ecf2649d8a2e54d1ca42ebfe1b4d6d880d2cc114f6065efa6d1066667f95644ce03cd9a1cd53a526d62
+  data.tar.gz: 4066cc0a59732f31a45a716eac0ae595fd4b8f5ff73cf0722e38f84e4a966c51c8fee1516aca7e953bd0cb2f7af57882e212eee212d6e05314c62a06b62a6b1f

data/CHANGELOG.rst

@@ -1,3 +1,13 @@
+v0.2.2
+------
+
+Changes
+~~~~~~~
+- ``Puppetfiler::Puppetfile#updates`` uses the ``concurrent-ruby`` gem,
+  shortening the execution time immensely.
+- ``Puppetfiler::Metadata#updates`` has been added and is also exposed
+  via ``puppetfiler check``.
+
 v0.2.1
 ------
 Cosmetical release

data/README.rst

@@ -38,6 +38,10 @@ named ``metadata.json``.
 check
 -----
 Check puppet forge for newer versions of used forge modules.
+For Puppetfiles the currently set version on newest on the forge are
+compared.
+For metadata.json puppetfiler checks that the newest version on the
+forge is covered by the range constraint.
 
 .. code:: sh
 

data/TODO

@@ -14,3 +14,5 @@
   However using arubas in-process execution it is possible to use webmock to mock these calls.
 
   It is quite ugly though: https://github.com/erikhuda/thor/wiki/Integrating-with-Aruba-In-Process-Runs
+
+* Check if the version and dependency settings are valid in context

data/data/metadata_outdated.json

@@ -0,0 +1,16 @@
+{
+    "name": "example-module",
+    "version": "0.1.0",
+    "author": "Some Author",
+    "summary": "Examplary summary",
+    "license": "MIT",
+    "source": "https://github.com/ntnn/puppetfiler",
+    "project_page": "https://github.com/ntnn/puppetfiler",
+    "issues_url": "https://github.com/ntnn/puppetfiler/issues",
+    "dependencies": [
+        {
+            "name": "puppetlabs/stdlib",
+            "version_requirement": ">= 4.13.0 < 4.14.0"
+        }
+    ]
+}

data/lib/puppetfiler.rb

@@ -34,13 +34,11 @@ module Puppetfiler
         when :puppetfile
             t = Puppetfiler::Puppetfile.new(target)
         when :metadata
-            # TODO see below
-            fail 'Checking metadata.json for version range updates is not implemented yet'
+            fail "File '#{target}' does not exist, aborting" if not File.exists?(target)
+            t = Puppetfiler::Metadata.new(File.new(target))
         else fail "Unkown type: #{type}"
         end
 
-        # TODO the updates should be collected asynchronously to
-        # speed up the process
         return t.updates
     end
 

data/lib/puppetfiler/cli.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'yaml'
 require 'puppetfiler/puppetfile'
 require 'puppetfiler/version'
+require 'semantic_puppet'
 
 module SemanticPuppet
     class Version < Numeric
@@ -11,6 +12,14 @@ module SemanticPuppet
     end
 end
 
+module SemanticPuppet
+    class VersionRange < Range
+        def length
+            to_s.length
+        end
+    end
+end
+
 module Puppetfiler
     class CLI < Thor
         class_option :puppetfile, {

data/lib/puppetfiler/metadata.rb

@@ -20,9 +20,38 @@ module Puppetfiler
             @dependencies.eql?(other.dependencies)
         end
 
+        def updates
+            require 'concurrent'
+
+            updates = {}
+
+            deps = @dependencies.map do |name, dep|
+                Concurrent::Future.execute do
+                    latest = dep.latest
+
+                    if not dep.range.cover?(latest)
+                        updates[name] = {
+                            :range  => dep.range,
+                            :newest => latest,
+                        }
+                    end
+                end
+            end
+
+            deps.each { |f| f.wait_or_cancel(300) }
+
+            return updates
+        end
+
         private
         def parse(target)
-            json = JSON.load(target)
+            begin
+                json = JSON.load(target)
+            rescue JSON::ParserError => error
+                STDERR.puts 'Passed metadata is invalid:'
+                STDERR.puts error
+                return nil
+            end
 
             if not json.has_key?('dependencies') or json['dependencies'].eql?([])
                 warn 'No dependencies found'

data/lib/puppetfiler/mod.rb

@@ -16,7 +16,7 @@ module Puppetfiler
             @name = args[:name]
             @slug = @name.gsub('/', '-')
 
-            @forge = PuppetForge::Module.find(@slug)
+            @forge = nil
 
             @range = nil
             %i{range version_requirement}.each do |v|
@@ -36,6 +36,10 @@ module Puppetfiler
             @version = latest_valid if not @version
         end
 
+        def forge
+            return @forge ||= PuppetForge::Module.find(@slug)
+        end
+
         def eql?(other)
             return false if not @name.eql?(other.name)
 
@@ -58,7 +62,7 @@ module Puppetfiler
         end
 
         def latest
-            return SemanticPuppet::Version.parse(@forge.current_release.version)
+            return SemanticPuppet::Version.parse(forge.current_release.version)
         end
 
         def valid_versions
@@ -66,7 +70,7 @@ module Puppetfiler
 
             versions = []
 
-            @forge.releases.each do |release|
+            forge.releases.each do |release|
                 version = SemanticPuppet::Version.parse(release.version)
                 versions << version if @range.cover?(version)
             end

data/lib/puppetfiler/puppetfile.rb

@@ -33,20 +33,28 @@ module Puppetfiler
         end
 
         def updates
-            updates = {}
+            require 'concurrent'
 
-            @modules.each do |name, mod|
-                current = mod.version
-                newest = mod.latest
+            updates = {}
 
-                if not newest.eql?(current)
-                    updates[name] = {
-                        :current => current,
-                        :newest  => newest,
-                    }
+            mods = @modules.map do |name, mod|
+                Concurrent::Future.execute do
+                    current = mod.version
+                    newest = mod.latest
+
+                    if not newest.eql?(current)
+                        updates[name] = {
+                            :current => current,
+                            :newest  => newest,
+                        }
+                    end
                 end
             end
 
+            # A timeout of 300 seconds per job should be plenty
+            # TODO configurable timeout
+            mods.each { |f| f.wait_or_cancel(300) }
+
             return updates
         end
 

data/lib/puppetfiler/version.rb

@@ -1,3 +1,3 @@
 module Puppetfiler
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
 end

data/puppetfiler.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'semantic_puppet', '~> 0.1.4'
   spec.add_dependency 'thor', '~> 0.19.4'
   spec.add_dependency 'hashie', '~> 3.5'
+  spec.add_dependency 'concurrent-ruby', '~> 1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetfiler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nelo-T. Wallus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email:
 - nelo@wallus.de
@@ -215,6 +229,7 @@ files:
 - data/empty_puppetfile.rb
 - data/metadata_emptydeps.json
 - data/metadata_nodeps.json
+- data/metadata_outdated.json
 - data/simple_metadata.json
 - data/simple_puppetfile.rb
 - exe/puppetfiler