qb 0.1.63 → 0.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef09e66c557199b31f1fa7725791ca7d85578c7
-  data.tar.gz: 56480bf1eecc3e6782681161fea75d5c44f07cc5
+  metadata.gz: c20bbb470860d5f8893a0b231f578aad308aa192
+  data.tar.gz: 6c3049e6fec28c454002d47feacc9148022ab1b1
 SHA512:
-  metadata.gz: 7abb2dfc2004d47864ef78d19a45a9b87b8a0068b17fc8824afb7c3a06a64fc2553528b8b4f6f4079fb10f8fdb25d76be0be1082be7cfa41132a846ab11d2b27
-  data.tar.gz: 3733e0018bd5a06cc2a8d8f2e83aa8bf9524bd1ef1b0eb87405e0aefe67eded5535d5e441c71eea1e0ec799ec052b246d58c14ad2a4ff9c0071239623fbf4ad4
+  metadata.gz: 6406952deeec382082b5234ec5a2f75a7afd21e2a05626a1f67efbeab29d823e96e814356e2d607d8ec47367cca04fdab6189bc21d0ef78d41fa516953bf269c
+  data.tar.gz: 8537a944f35e7337a0aeb3dd1df7fec6c6446d913b8f1e5d4354d71c3863ce507cbb3ed797edb4fff07fa1825ac5a5366f9a7919bf87148a49204f160ca29f21

data/lib/qb/options.rb

@@ -2,6 +2,7 @@ require 'optparse'
 
 require_relative "role/errors"
 require_relative "options/option"
+require 'qb/package/version'
 
 module QB
   class Options
@@ -133,6 +134,8 @@ module QB
               Array
             when 'integer', 'int'
               Integer
+            when 'version'
+              QB::Package::Version
             when Hash
               if option.meta['type'].key? 'one_of'
                 klass = Class.new
@@ -274,6 +277,10 @@ module QB
       end
       
       opt_parser = OptionParser.new do |opts|
+        opts.accept(QB::Package::Version) do |string|
+          QB::Package::Version.from_string(string).to_h
+        end
+        
         opts.banner = @role.banner
         
         opts.on(

data/lib/qb/options/option.rb

@@ -38,7 +38,10 @@ module QB
           Options.cli_ize_name "#{ @include_path.join('-') }-#{ @meta_name }"
         end
         
-        @var_name = if role.var_prefix
+        @var_name = if @meta['var_name']
+          # prefer an explicit, exact variable name if provided
+          @meta['var_name']
+        elsif role.var_prefix
           Options.var_ize_name "#{ role.var_prefix }_#{ @meta_name }"
         else
           Options.var_ize_name @meta_name

data/lib/qb/package/version.rb

@@ -0,0 +1,80 @@
+module QB
+  module Package
+    # An attempt to unify NPM and Gem version schemes to a reasonable extend, 
+    # and hopefully cover whatever else the cat may drag in.
+    class Version
+      # Create a Version instance from a Gem::Version
+      def self.from_gem_version version
+        release_segments = version.segments.take_while {|seg| !seg.is_a?(String)}
+        prerelease_segments = version.segments[release_segments.length..-1]
+        
+        new raw: version.to_s,
+            major: release_segments[0],
+            minor: release_segments[1],
+            patch: release_segments[2],
+            prerelease: prerelease_segments,
+            build: [],
+            release: version.release.to_s
+      end
+      
+      def self.from_npm_version version
+        stmt = NRSER.squish <<-END
+          var Semver = require('semver');
+          
+          console.log(
+            JSON.stringify(
+              Semver(#{ JSON.dump version })
+            )
+          );
+        END
+        
+        parse = JSON.load Cmds.out!("node --eval %s", stmt)
+        
+        new raw: version,
+            major: parse['major'],
+            minor: parse['minor'],
+            patch: parse['patch'],
+            prerelease: parse['prerelease'],
+            build: parse['build'],
+            release: [parse['major'], parse['minor'], parse['patch']].join(".")
+      end
+      
+      def self.from_string string
+        if string.include? '-'
+          self.from_npm_version string
+        else
+          self.from_gem_version Gem::Version.new(string)
+        end
+      end
+      
+      # Construct a new Version
+      def initialize raw:, major:, minor:, patch:, prerelease:, build:, release:
+        @raw = raw
+        @major = major
+        @minor = minor
+        @patch = patch
+        @prerelease = prerelease
+        @build = build
+        @release = release
+        
+        @level = @prerelease[0] || 'release'
+        
+        @is_release = @prerelease.empty?
+        @is_dev = @prerelease[0] == 'dev'
+        @is_rc = @prerelease[0] == 'rc'
+      end
+      
+      # dump all instance variables into a hash
+      def to_h
+        instance_variables.map {|var| 
+          [var[1..-1], instance_variable_get(var)]
+        }.to_h
+      end # #to_h
+      
+      # Dump all instance variables in JSON serialization
+      def to_json *args
+        to_h.to_json *args
+      end
+    end
+  end # Package
+end # QB

data/lib/qb/version.rb

@@ -1,7 +1,7 @@
 module QB
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.63"
+  VERSION = "0.1.64"
   
   def self.gemspec
     Gem.loaded_specs[GEM_NAME]

data/library/path_facts

@@ -14,6 +14,7 @@ end
 require 'ostruct'
 
 require 'qb'
+require 'qb/package/version'
 require 'cmds'
 require 'pathname'
 require 'uri'
@@ -28,70 +29,6 @@ end
 GITHUB_SSH_URL_RE = /^git@github\.com\:(?<owner>.*)\/(?<name>.*)\.git$/
 GITHUB_HTTPS_URL_RE = /^https:\/\/github\.com\/(?<owner>.*)\/(?<name>.*)\.git$/
 
-# An attempt to unify NPM and Gem version schemes to a reasonable extend, 
-# and hopefully cover whatever else the cat may drag in.
-class Version
-  # Create a Version instance from a Gem::Version
-  def self.from_gem_version version
-    release_segments = version.segments.take_while {|seg| !seg.is_a?(String)}
-    prerelease_segments = version.segments[release_segments.length..-1]
-    
-    new raw: version.to_s,
-        major: release_segments[0],
-        minor: release_segments[1],
-        patch: release_segments[2],
-        prerelease: prerelease_segments,
-        build: [],
-        release: version.release
-  end
-  
-  def self.from_npm_version version
-    stmt = NRSER.squish <<-END
-      var Semver = require('semver');
-      
-      console.log(
-        JSON.stringify(
-          Semver(#{ JSON.dump version })
-        )
-      );
-    END
-    
-    parse = JSON.load Cmds.out!("node --eval %s", stmt)
-    
-    new raw: version,
-        major: parse['major'],
-        minor: parse['minor'],
-        patch: parse['patch'],
-        prerelease: parse['prerelease'],
-        build: parse['build'],
-        release: [parse['major'], parse['minor'], parse['patch']].join(".")
-  end
-  
-  # Construct a new Version
-  def initialize raw:, major:, minor:, patch:, prerelease:, build:, release:
-    @raw = raw
-    @major = major
-    @minor = minor
-    @patch = patch
-    @prerelease = prerelease
-    @build = build
-    @release = release
-    
-    @level = @prerelease[0] || 'release'
-    
-    @is_release = @prerelease.empty?
-    @is_dev = @prerelease[0] == 'dev'
-    @is_rc = @prerelease[0] == 'rc'
-  end
-  
-  # Dump all instance variables in JSON serialization
-  def to_json *args
-    instance_variables.map {|var| 
-      [var[1..-1].to_sym, instance_variable_get(var)]
-    }.to_h.to_json *args
-  end
-end
-
 class PathFacts < QB::AnsibleModule
   # Add a bunch of useful things to know about the path
   def add_path_facts
@@ -225,7 +162,7 @@ class PathFacts < QB::AnsibleModule
     
     spec = Gem::Specification::load(gemspec_path.to_s)
     gem.name = spec.name
-    gem.version = Version.from_gem_version spec.version
+    gem.version = QB::Package::Version.from_gem_version spec.version
   end
   
   # Add facts about an NPM package based in `@path`, if any.
@@ -246,7 +183,10 @@ class PathFacts < QB::AnsibleModule
     
     # To stay consistent with Gem
     npm.name = npm.package_json['name']
-    npm.version = Version.from_npm_version npm.package_json['version']
+    
+    npm.version = QB::Package::Version.from_npm_version(
+      npm.package_json['version']
+    )
   end
   
   # Run the module.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.63
+  version: 0.1.64
 platform: ruby
 authors:
 - nrser
@@ -183,6 +183,7 @@ files:
 - lib/qb/ansible_module.rb
 - lib/qb/options.rb
 - lib/qb/options/option.rb
+- lib/qb/package/version.rb
 - lib/qb/role.rb
 - lib/qb/role/errors.rb
 - lib/qb/util.rb