qb 0.1.72 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ee085b4ad133ca61ffc618b9e91886b22d623a
-  data.tar.gz: e4a66a0fa5f86d261310562d93dc6896285d87c2
+  metadata.gz: baf1eddaaa71efa535ebd3f532c7c2d8e28a1b23
+  data.tar.gz: b250253f17d6f9e39e2acaea1c62b2355260dc6a
 SHA512:
-  metadata.gz: 84cc40de910e66c346335b39e63d4d10bbe3f73bc6c53ce070a8e8e63f5265602869e42ff2cdfdc83d4bc2294346193e95954b76f3df86226b75d7e82438b289
-  data.tar.gz: 756bf8f03c836c59ff05b17d074232673a63fb46f48d2a91a871ac636cb8ce16ad86fc79e3c4f44e75877e12354f51a1b8467ff782029b485c5c2c439b474ea0
+  metadata.gz: a4a205093b9e7b961fb1c3c4dbab7589228d58a954dcde6ee8bdcb637ef9e8b338e39da1b4333b03b5de43a0d5b12d73fae77a93f7d9fe06f29abb0de075b6ff
+  data.tar.gz: 78d9edc4152419d0f0af107355b2eb494f16c01694720b5605575fc597484f6ba3e7e988d3f97da9c8e9453eaaf0656566d3c6837edfbbff0360de2f7a48f497

data/lib/qb/ansible_module.rb

@@ -3,27 +3,28 @@ require 'pp'
 
 module QB
   class AnsibleModule
+    
+    # Class Variables
+    # =====================================================================
+    
     @@arg_types = {}
     
+    
+    # Class Methods
+    # =====================================================================
+    
     def self.stringify_keys hash
       hash.map {|k, v| [k.to_s, v]}.to_h
     end
     
+    
     def self.arg name, type
       @@arg_types[name.to_sym] = type
     end
     
-    def debug *args
-      if @qb_stdio_err
-        header = "<QB::AnsibleModule #{ self.class.name }>"
-        
-        if args[0].is_a? String
-          header += " " + args.shift
-        end
-        
-        QB.debug header, *args
-      end
-    end
+    
+    # Constructor
+    # =====================================================================
     
     def initialize
       @changed = false
@@ -31,13 +32,14 @@ module QB
       @input = File.read @input_file
       @args = JSON.load @input
       @facts = {}
+      @warnings = []
       
       @qb_stdio_out = nil
       @qb_stdio_err = nil
       @qb_stdio_in = nil
       
-      debug "HERE!"
-      debug ENV
+      # debug "HERE!"
+      # debug ENV
       
       # if QB_STDIO_ env vars are set send stdout and stderr
       # to those sockets to print in the parent process
@@ -75,6 +77,53 @@ module QB
       }
     end
     
+    
+    
+    # Instance Methods
+    # =====================================================================
+    
+    # Logging
+    # ---------------------------------------------------------------------
+    # 
+    # Logging is a little weird in Ansible modules... Ansible has facilities
+    # for notifying the user about warnings and depreciations, which we will
+    # make accessible, but it doesn't seem to have facilities for notices and
+    # debugging, which I find very useful.
+    # 
+    # When run inside of QB (targeting localhost only at the moment, sadly)
+    # we expose additional IO channels for STDIN, STDOUT and STDERR through
+    # opening unix socket files that the main QB process spawns threads to 
+    # listen to, and we provide those file paths via environment variables
+    # so modules can pick those up and interact with those streams, allowing
+    # them to act like regular scripts inside Ansible-world (see 
+    # QB::Util::STDIO for details and implementation).
+    # 
+    # We use those channels if present to provide logging mechanisms.
+    # 
+    
+    # Forward args to {QB.debug} if we are connected to a QB STDERR stream
+    # (write to STDERR).
+    # 
+    # @param args see QB.debug
+    # 
+    def debug *args
+      if @qb_stdio_err
+        header = "<QB::AnsibleModule #{ self.class.name }>"
+        
+        if args[0].is_a? String
+          header += " " + args.shift
+        end
+        
+        QB.debug header, *args
+      end
+    end
+    
+    # Append a warning message to @warnings.
+    def warn msg
+      @warnings << msg
+    end
+    
+    
     def run
       result = main
       
@@ -98,7 +147,8 @@ module QB
     
     def done
       exit_json changed: @changed,
-                ansible_facts: self.class.stringify_keys(@facts)
+                ansible_facts: self.class.stringify_keys(@facts),
+                warnings: @warnings
     end
     
     def exit_json hash
@@ -123,7 +173,7 @@ module QB
     end
     
     def fail msg
-      exit_json failed: true, msg: msg
+      exit_json failed: true, msg: msg, warnings: @warnings
     end
   end
 end # QB

data/lib/qb/errors.rb

@@ -16,4 +16,8 @@ module QB
   # Raised when the current QB version doesn't satisfy a role as defined
   # in `<role_dir>/meta/qb[.yml]:required_qb_version`).
   class QBVersionError < VersionError; end
+  
+  # Raised when the file system is in a state that doesn't work for what we're
+  # trying to do.
+  class FSStateError < Error; end
 end # module QB

data/lib/qb/options.rb

@@ -136,18 +136,31 @@ module QB
               Integer
             when 'version'
               QB::Package::Version
+            when 'hash', 'dict'
+              Class.new.tap { |klass|
+                opts.accept(klass) {|value|
+                  value.split(',').map { |pair_str|
+                    split = pair_str.split ':'
+                    if split.length > 2
+                      raise "Can only have a single ':' in hash options, " +
+                            "found #{ pair_str.inspect } in #{ value.inspect }"
+                    end
+                    [split[0], split[1]]
+                  }.to_h
+                }
+              }
             when Hash
               if option.meta['type'].key? 'one_of'
-                klass = Class.new
-                opts.accept(klass) {|value|
-                  if option.meta['type']['one_of'].include? value
-                    value
-                  else
-                    raise QB::Role::MetadataError,
-                      "option '#{ option.cli_name }' must be one of: #{ option.meta['type']['one_of'].join(', ') }"
-                  end
+                Class.new.tap { |klass|
+                  opts.accept(klass) {|value|
+                    if option.meta['type']['one_of'].include? value
+                      value
+                    else
+                      raise QB::Role::MetadataError,
+                        "option '#{ option.cli_name }' must be one of: #{ option.meta['type']['one_of'].join(', ') }"
+                    end
+                  }
                 }
-                klass
               else 
                 raise QB::Role::MetadataError,
                   "bad type for option #{ option.meta_name }: #{ option.meta['type'].inspect }"

data/lib/qb/package/version.rb

@@ -1,20 +1,56 @@
+require 'nrser/types'
+
+T = NRSER::Types
+
 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.
+    # 
+    # Intended to be immutable for practical purposes.
+    # 
     class Version
+      
+      # Class Methods
+      # =====================================================================
+      
+      # Utilities
+      # ---------------------------------------------------------------------
+      
+      # @return [String]
+      #   Time formatted to be stuck in a version segment per Semver spec.
+      #   We also strip out '-' to avoid possible parsing weirdness.
+      def self.to_time_segment time
+        time.utc.iso8601.gsub /[^0-9A-Za-z]/, ''
+      end
+      
+      # Instance Builders
+      # ---------------------------------------------------------------------
+      
       # 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)}
+        # release segments are everything before a string
+        release_segments = version.segments.take_while { |seg|
+          !seg.is_a?(String)
+        }
+        
+        # We don't support > 3 release segments to make life somewhat
+        # reasonable. Yeah, I think I've seen projects do it. We'll cross that
+        # bridge if and when we get to it.
+        if release_segments.length > 3
+          raise ArgumentError,
+                "We don't handle releases with more than 3 segments " +
+                "(found #{ release_segments.inspect } in #{ version })"
+        end
+        
         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],
+            major: release_segments[0] || 0,
+            minor: release_segments[1] || 0,
+            patch: release_segments[2] || 0,
             prerelease: prerelease_segments,
-            build: [],
-            release: version.release.to_s
+            build: []
       end
       
       def self.from_npm_version version
@@ -37,8 +73,7 @@ module QB
             minor: parse['minor'],
             patch: parse['patch'],
             prerelease: parse['prerelease'],
-            build: parse['build'],
-            release: [parse['major'], parse['minor'], parse['patch']].join(".")
+            build: parse['build']
       end
       
       def self.from_string string
@@ -49,6 +84,44 @@ module QB
         end
       end
       
+      
+      # Instantiate from a hash. Slices out
+      # 
+      # -   `raw`
+      # -   `major`
+      # -   `minor`
+      # -   `patch`
+      # -   `prerelease`
+      # -   `build`
+      # 
+      # And passes their values to the constructor. Keys may be strings or 
+      # symbols. All other key/values are ignored, allowing you to pass in 
+      # the JSON encoding of a version instance.
+      # 
+      # @param [Hash] hash
+      #   Values to be passed to constructor.
+      # 
+      # @return [QB::Package::Version]
+      # 
+      def self.from_h hash
+        self.new(
+          NRSER.slice_keys(
+            NRSER.symbolize_keys(hash),
+            :raw,
+            :major,
+            :minor,
+            :patch,
+            :prerelease,
+            :build,
+          )
+        )
+      end # #from_h
+      
+      
+      
+      # Attributes
+      # =====================================================================
+      
       attr_reader :raw,
                   :major,
                   :minor,
@@ -56,40 +129,219 @@ module QB
                   :prerelease,
                   :build,
                   :release,
-                  :level,
-                  :is_release,
-                  :is_dev,
-                  :is_rc
+                  :level
+      
+      
+      # Constructor
+      # =====================================================================
       
       # 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'
+      def initialize(
+        raw: nil,
+        major:,
+        minor: 0,
+        patch: 0,
+        prerelease: [],
+        build: []
+      )
+        @raw = T.maybe(T.str).check raw
+        @major = T.non_neg_int.check major
+        @minor = T.non_neg_int.check minor
+        @patch = T.non_neg_int.check patch
+        @prerelease = T.array(T.union(T.non_neg_int, T.str)).check prerelease
+        @build = T.array(T.union(T.non_neg_int, T.str)).check build
+        @release = [major, minor, patch].join '.'
         
-        @is_release = @prerelease.empty?
-        @is_dev = @prerelease[0] == 'dev'
-        @is_rc = @prerelease[0] == 'rc'
+        @level = T.match @prerelease[0], {
+          T.is(nil) => ->(_) { nil },
+          
+          T.str => ->(str) { str },
+          
+          T.non_neg_int => ->(int) { nil },
+        }
       end
       
+      
+      # Instance Methods
+      # =====================================================================
+      
+      # Tests
+      # ---------------------------------------------------------------------
+      
+      # @return [Boolean]
+      #   True if this version is a release (no prerelease or build values).
+      # 
       def release?
-        @is_release
+        @prerelease.empty? && @build.empty?
       end
       
+      
+      # @return [Boolean]
+      #   True if any prerelease segments are present (stuff after '-' in 
+      #   SemVer / "NPM" format, or the first string segment and anything
+      #   following it in "Gem" format). Tests if {@prerelease} is not
+      #   empty.
+      # 
+      def prerelease?
+        !@prerelease.empty?
+      end
+      
+      
+      # @return [Boolean]
+      #   True if any build segments are present (stuff after '+' character
+      #   in SemVer / "NPM" format). Tests if {@build} is empty.
+      #   
+      #   As of writing, we don't have a way to convey build segments in 
+      #  "Gem" version format, so this will always be false when loading a 
+      #   Gem version.
+      # 
+      def build?
+        !@build.empty?
+      end
+      
+      
+      # @return [Boolean]
+      #   True if self is a prerelease version that starts with a string that
+      #   we consider the 'level'.
+      #   
+      def level?
+        !@level.nil?
+      end
+      
+      
+      # @return [Boolean]
+      #   True if this version is a dev prerelease (first prerelease element 
+      #   is 'dev').
+      # 
       def dev?
-        @is_dev
+        @level == 'dev'
       end
       
+      
+      # @return [Boolean]
+      #   True if this version is a release candidate (first prerelease element
+      #   is 'rc').
+      # 
       def rc?
-        @is_rc
+        @level == 'rc'
+      end
+      
+      
+      # Transformations
+      # ---------------------------------------------------------------------
+      
+      # @return [String]
+      #   A normalized raw version string in
+      #   `Major.minor.patch-prerelease+build` format.
+      def normalized
+        result = release
+        
+        unless prerelease.empty?
+          result += "-#{ prerelease.join '.' }"
+        end
+        
+        unless build.empty?
+          result += "+#{ build.join '.' }"
+        end
+        
+        result
+      end # #normalized
+      
+      
+      # @return [QB::Package::Version]
+      #   A new {QB::Package::Version} created from {#release}. Even if `self`
+      #   *is* a release version already, still returns a new instance.
+      # 
+      def release_version
+        self.class.from_string release
+      end # #release_version
+      
+      
+      def merge overrides = {}
+        self.class.new self.to_h.merge(overrides)
+      end
+      
+      
+      # Return a new {QB::Package::Version} with build information added.
+      # 
+      # @return [QB::Package::Version]
+      # 
+      def build_version branch: nil, ref: nil, time: nil
+        time = self.class.to_time_segment(time) unless time.nil?
+        
+        segments = [branch, ref, time].reject &:nil?
+        
+        if segments.empty?
+          raise ArgumentError,
+                "Need to provide at least one of branch, ref, time."
+        end
+        
+        merge raw: nil,
+              build: segments.join('.')
       end
       
+      
+      # Language Interface
+      # =====================================================================
+      
+      # Test for equality.
+      # 
+      # Compares classes then {QB::Package::Version#to_a} results.
+      # 
+      # @param [Object] other
+      #   Object to compare to self.
+      # 
+      # @return [Boolean]
+      #   True if self and other are considered equal.
+      # 
+      def == other
+        other.class == self.class &&
+        other.to_a == self.to_a 
+      end # #==
+      
+      
+      # Return array of the version elements in order from greatest to least
+      # precedence.
+      # 
+      # This is considered the representative structure for the object's data,
+      # from which all other values are dependently derived, and is used in 
+      # {#==}, {#hash} and {#eql?}.
+      # 
+      # @example
+      #   
+      #   version = QB::Package::Version.from_string(
+      #     "0.1.2-rc.10+master.0ab1c3d"
+      #   )
+      #   
+      #   version.to_a
+      #   # => [0, 1, 2, ['rc', 10], ['master', '0ab1c3d']]
+      #   
+      #   QB::Package::Version.from_string('1').to_a
+      #   # => [1, nil, nil, [], []]
+      # 
+      # @return [Array]
+      # 
+      def to_a
+        [
+          major,
+          minor,
+          patch,
+          prerelease,
+          build,
+        ]
+      end # #to_a
+      
+      
+      def hash
+        to_a.hash
+      end
+      
+      
+      def eql? other
+        self == other && self.hash == other.hash
+      end
+      
+      
       # dump all instance variables into a hash
       def to_h
         instance_variables.map {|var| 
@@ -97,14 +349,25 @@ module QB
         }.to_h
       end # #to_h
       
+      
       # Dump all instance variables in JSON serialization
       def to_json *args
-        to_h.to_json *args
+        to_h.merge(
+          is_release: release?,
+          is_prerelease: prerelease?,
+          is_build: build?,
+          is_dev: dev?,
+          is_rc: rc?,
+          has_level: level?,
+          normalized: normalized,
+        ).to_json *args
       end
       
+      
       def to_s
         "#<QB::Package::Version #{ @raw }>"
       end
-    end
+      
+    end # class Version
   end # Package
 end # QB

data/lib/qb/role.rb

@@ -139,7 +139,10 @@ module QB
         uniq
     end
     
-    # get an array of QB::Role that match an input string
+    # Get an array of QB::Role that match an input string.
+    # 
+    # @return [Array<QB::Role>]
+    # 
     def self.matches input
       # keep this here to we don't re-gen every loop
       available = self.available

data/lib/qb/role/errors.rb

@@ -19,7 +19,16 @@ module QB
         @input = input
         @matches = matches
         
-        super "mutiple roles match input #{ @input.inspect }:\n#{ @matches.join("\n") }"
+        super <<-END
+multiple roles match input #{ @input.inspect }:\
+
+#{
+  @matches.map { |role|
+    "-   #{ role.to_s } (#{ role.path.to_s })"
+  }.join("\n")
+}
+
+END
       end
     end
     

data/lib/qb/version.rb

@@ -4,7 +4,7 @@ module QB
   
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.72"
+  VERSION = "0.1.73"
   
   MIN_ANSIBLE_VERSION = Gem::Version.new '2.1.2'
   

data/library/path_facts

@@ -29,6 +29,7 @@ end
 GITHUB_SSH_URL_RE = /^git@github\.com\:(?<owner>.*)\/(?<name>.*)\.git$/
 GITHUB_HTTPS_URL_RE = /^https:\/\/github\.com\/(?<owner>.*)\/(?<name>.*)\.git$/
 
+
 class PathFacts < QB::AnsibleModule
   # Add a bunch of useful things to know about the path
   def add_path_facts
@@ -57,8 +58,9 @@ class PathFacts < QB::AnsibleModule
     @result.is_realpath = @result.realpath == @path
   end
   
-  # If the path is a Git repo (has a .git file in it's root) add useful
-  # Git facts.
+  
+  # If the path is part of a Git repo, as well as useful general
+  # Git environment facts.
   def add_git_facts
     # see if we're in a git repo. first, we need a directory that exists
     dir = @path.expand_path.ascend.find {|p| p.directory? }
@@ -143,6 +145,7 @@ class PathFacts < QB::AnsibleModule
     end
   end
   
+  
   # Find the only *.gemspec path in the `@path` directory. Warns and returns
   # `nil` if there is more than one match.
   def gemspec_path
@@ -159,6 +162,7 @@ class PathFacts < QB::AnsibleModule
     end
   end
   
+  
   # If `path` is a directory containing the source for a Ruby Gem, add 
   # useful information about it.
   def add_gem_facts
@@ -186,6 +190,8 @@ class PathFacts < QB::AnsibleModule
     gem.version = QB::Package::Version.from_gem_version spec.version
   end
   
+  
+  
   # Add facts about an NPM package based in `@path`, if any.
   def add_npm_facts
     package_json_path = @path.join('package.json')
@@ -212,6 +218,57 @@ class PathFacts < QB::AnsibleModule
     end
   end
   
+  
+  # Add version/package facts derives from @path/VERSION file if one exists.
+  # 
+  # Added values:
+  # 
+  # -   Always:
+  #     -   `has_version_file` - Boolean
+  #         -   True if `@path/VERSION` exists and was successfully parsed.
+  # 
+  # -   If `has_version_file` is `true`:
+  #     -   
+  # 
+  def add_version_file_facts
+    unless @path.directory?
+      @result.has_version_file = false
+      return
+    end
+    
+    version_file_path = @path.join 'VERSION'
+    
+    unless version_file_path.file?
+      @result.has_version_file = false
+      return
+    end
+    
+    version = begin
+      QB::Package::Version.from_string version_file_path.read
+    rescue Exception => e
+      warn "Unable to parse version from #{ version_file_path.to_s }; #{ e }"
+      @result.has_version_file = false
+      return
+    end
+    
+    @result.has_version_file = true
+    
+    version_file = @result.version_file = Result.new
+    @result.package.types << 'version_file'
+    
+    # get the name from git if we have it
+    if @result.is_git && @result.git.name
+      version_file.name = @result.git.name
+    else
+      # otherwise use the directory name
+      version_file.name = version_file_path.dirname.basename.to_s
+    end
+    
+    version_file.version = version
+    version_file.path = version_file_path
+  end
+  
+  
   # Run the module.
   def main
     # check the 'path' arg
@@ -225,13 +282,14 @@ class PathFacts < QB::AnsibleModule
     
     # Default to signaling no change (we're not gonna change anything in this
     # module either)
-    @result.changed = false
+    @result.changed = @changed
     
     # String warnings that will be shown to the user
-    @result.warnings = []
+    @result.warnings = @warnings
     
-    @result.package = Result.new
-    @result.package.types = []
+    # Set this up here so `add_*_facts` can append to `package.types`
+    package = @result.package = Result.new
+    package.types = []
     
     # Return the input as 'raw'
     @result.raw = @args['path']
@@ -239,10 +297,19 @@ class PathFacts < QB::AnsibleModule
     @path = Pathname.new @result.raw
     
     add_path_facts
+    
+    # Add git facts if @path is in a git repo
     add_git_facts
+    
+    # Add Ruby Gem version/package facts if @path is the root of a Ruby Gem
     add_gem_facts
+    
+    # Add version/package facts from a @path/package.json file if present
     add_npm_facts
     
+    # Add version/package facts from a @path/VERSION file if present
+    add_version_file_facts
+    
     # If we only have one type of package present, we set it's type and 
     # version as `package.type` and `package.version`, which makes it easy for
     # code to 'auto-detect' the info.
@@ -250,10 +317,48 @@ class PathFacts < QB::AnsibleModule
     # If there's more than one then we obviously can't guess what to do; the
     # user needs to specify.
     # 
-    if @result.package.types.length == 1
-      @result.package.type = @result.package.types[0]
-      @result.package.name = @result[@result.package.type].name
-      @result.package.version = @result[@result.package.type].version
+    if package.types.length == 1
+      package.type = package.types[0]
+      package.name = @result[package.type].name
+      package.version = @result[package.type].version
+    else
+      # Otherwise, if all the present info matches, we can use that.
+      # 
+      # We won't have a `type` though, because that doesn't make any sense.
+      # 
+      
+      # See if we have a unique common version that we can use for the overall
+      # version of the package.
+      # 
+      versions = package.types.
+        # Map the types to their version object
+        map { |type| @result[type].version }.
+        # Omit any that don't have a version
+        reject(&:nil?).
+        # Reduce to unique versions
+        uniq
+      
+      # Do we have a single unique version?
+      if versions.length == 1
+        # Yes!
+        package.version = versions.first
+      end
+      
+      # See if we have a unique common name that we can use use for the overall
+      # name of the package
+      # 
+      # TODO  since version_file kinda fudges this using the git repo name or
+      #       directory name, this might be problematic since those may not
+      #       stay consistent... we'll have to see how it goes.
+      # 
+      names = package.types.
+        map { |type| @result[type].name }.
+        reject(&:nil?).
+        uniq
+      
+      if names.length == 1
+        package.name = names.first
+      end
     end
     
     nil

data/qb.gemspec

@@ -94,7 +94,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   
   spec.add_dependency "cmds",'~> 0.0', ">= 0.2.1"
-  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.17"
+  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.18"
   spec.add_dependency "nrser-extras", '~> 0.0', ">= 0.0.3"
   spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.9"
   spec.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'

data/roles/nrser.rbenv_gem/tasks/main.yml

@@ -32,8 +32,8 @@
       
       {'rubies_list' => list}
 
-- debug:
-    msg: "{{ rbenv_gem_rubies_list }}"
+# - debug:
+#     msg: "{{ rbenv_gem_rubies_list }}"
 
 # this will clone the repo, build the .gem and point rbenv_gem_source to it
 - include: clone-repo.yml

data/roles/nrser.rbenv_gem/tasks/manage-version.yml

@@ -30,7 +30,7 @@
     version: "{{ rbenv_gem_version }}"
     executable: /usr/bin/gem
   become: true
-  when: "{{ rbenv_gem_version and (item == 'system') }}"
+  when: rbenv_gem_version and (item == 'system')
   with_items: "{{ rbenv_gem_rubies_list }}"
 
 - name: "manage {{ rbenv_gem_name }} gem in system ruby"
@@ -41,5 +41,5 @@
     version: "{{ rbenv_gem_version }}"
     executable: /usr/bin/gem
   become: true
-  when: "{{ (not rbenv_gem_version) and (item == 'system') }}"
+  when: (not rbenv_gem_version) and (item == 'system')
   with_items: "{{ rbenv_gem_rubies_list }}"

data/roles/qb.bump/tasks/frontend/level/rc.yml

@@ -113,7 +113,7 @@
 # shitty ansible.
 # 
 # - name: kickoff frontend build...
-#   when: "{{ bump_build }}"
+#   when: bump_build
 #   include_role:
 #     name: build
 #   vars:

data/roles/qb.git_repo/tasks/main.yml

@@ -1,34 +1,51 @@
 ---
 # tasks file for qb.git_repo
 
-- name: initialize git
+- name: >-
+    Create {{ git_repo_dest }} directory
+  file:
+    dest: >-
+      {{ git_repo_dest }}
+    state: directory
+
+- name: >-
+    Initialize git
   command: git init
   args:
-    chdir: "{{ git_repo_dest }}"
-    creates: "{{ git_repo_dest }}/.git"
+    chdir: >-
+      {{ git_repo_dest }}
+    creates: >-
+      {{ git_repo_dest }}/.git
 
-- name: Tell Git to ignore OSX artifacts 
+- name: >-
+    Tell Git to ignore OSX artifacts 
   when: ansible_distribution == "MacOSX"
   include_role:
     name: qb.gitignore
   vars:
     gitignore_name: Global/macOS
-    gitignore_dest: "{{ git_repo_dest }}"
+    gitignore_dest: >-
+      {{ git_repo_dest }}
 
-- name: Tell Git to ignore QB artifacts
+- name: >-
+    Tell Git to ignore QB artifacts
   include_role:
     name: qb.gitignore
   vars:
     gitignore_name: QB
-    gitignore_dest: "{{ git_repo_dest }}"
+    gitignore_dest: >-
+      {{ git_repo_dest }}
 
 - name: >-
     Tell Git to ignore each of <git_repo_gitignores>
-  with_items: "{{ git_repo_gitignores }}"
+  with_items: >-
+    {{ git_repo_gitignores }}
   loop_control:
     loop_var: name
   include_role:
     name: qb.gitignore
   vars:
-    gitignore_name: "{{ name }}"
-    gitignore_dest: "{{ git_repo_dest }}"
+    gitignore_name: >-
+      {{ name }}
+    gitignore_dest: >-
+      {{ git_repo_dest }}

data/roles/qb.install/defaults/main.yml

@@ -1,13 +1,20 @@
 ---
 # defaults file for qb.install
 
-install_path: "{{ qb_user_roles_dir }}"
+install_path: >-
+  {{ qb_user_roles_dir }}
 
-install_src: "{% if install_create -%}
-  {{ ansible_env.GITHUB_HOME }}/{{ install_name.split('.')[0] }}/ansible-{{ install_name }}
-{%- else -%}
-  {{ install_name.split('.')[0] }}/ansible-{{ install_name }}
-{%- endif %}"
+install_src: >-
+  {{
+    (
+      ansible_env.GITHUB_HOME | path_join(
+        install_name.split('.')[0],
+        ('ansible-' + install_name)
+      )
+    ) if install_create else (
+      install_name.split('.')[0] | path_join('ansible-' + install_name)
+    )
+  }}
 
 install_version: master
 
@@ -15,10 +22,13 @@ install_force: false
 
 install_update: false
 
-install_link: "{% if install_create -%}
-  true
-{%- else -%}
-  false
-{%- endif %}"
+install_link: >-
+  {{ install_create }}
 
 install_create: false
+
+install_edit: >-
+  {{ install_create }}
+
+install_add_to_project: false
+  

data/roles/qb.install/meta/main.yml

@@ -6,7 +6,7 @@ allow_duplicates: yes
 dependencies: # []
 # - role: role-name
 - role: qb.qb_role
-  when: "{{ install_create }}"
+  when: install_create
   role_dest: "{{ install_src }}"
   role_role_name: "{{ install_name }}"
   role_project: true

data/roles/qb.install/meta/qb.yml

@@ -39,11 +39,17 @@ default_user: null
 save_options: false
 
 examples:
-  create a new role backed by a GitHub repo: >
+  Create a new role backed by a GitHub repo: >
     
     qb install --create --name=nrser.blah
     
     (`name` needs to have the namespace attached if one is desired)
+  
+  Add a newly created role to the current Atom project:
+    
+    (Assumes $EDITOR is set to Atom's path)
+    
+    qb install --create --name=nrser.blah --add-to-project
 
 options:
 # - name: example
@@ -101,3 +107,18 @@ options:
   required: false
   type: boolean
   short: c
+
+- name: edit
+  description: >-
+    Open the role direcotry in EDITOR when done.
+  type: boolean
+  short: e
+
+- name: add_to_project
+  description: >-
+    Include an `--add` option when opening role directory in EDITOR.
+    Added for Atom to add to current project, but who knows, maybe
+    works elsewhere too.
+  type: boolean
+  short: a
+    

data/roles/qb.install/tasks/edit.yml

@@ -0,0 +1,9 @@
+---
+  
+- name: >-
+    Open new qb role repo in Atom
+  shell: >-
+    {{ ansible_env.EDITOR.replace('--wait', '') }}
+    {% if install_add_to_project %}--add{% endif %}
+    {{ install_src }}
+  

data/roles/qb.install/tasks/link.yml

@@ -1,16 +1,17 @@
 ---
 # symlink to src directory
 
-- name: |
+- when: install_force
+  name: |
     remove destination
     
       {{ install_path }}/{{ install_name }}
     
     prior to linking.
   file:
-    path: "{{ install_path }}/{{ install_name }}"
+    path: >-
+      {{ install_path }}/{{ install_name }}
     state: absent
-  when: "{{ install_force }}"
 
 - name: |
     symlink
@@ -21,7 +22,9 @@
     
       {{ install_src | realpath }}
   file:
-    src: "{{ install_src | realpath }}"
-    dest: "{{ install_path }}/{{ install_name }}"
+    src: >-
+      {{ install_src | realpath }}
+    dest: >-
+      {{ install_path }}/{{ install_name }}
     state: link
     

data/roles/qb.install/tasks/main.yml

@@ -7,5 +7,5 @@
 - include: link.yml
   when: install_link
 
-- include: create.yml
-  when: install_create
+- include: edit.yml
+  when: install_edit

data/roles/qb.release_gem/tasks/main.yml

@@ -7,10 +7,37 @@
     bind:
       qb_dir: "{{ qb_dir }}"
     src: |
-      spec = Gem::Specification::load(Dir.glob("#{ qb_dir }/*.gemspec")[0])
-      name = spec.name
+      spec_pattern = "#{ qb_dir }/*.gemspec"
+      spec_path = Dir.glob(spec_pattern)[0]
       
-      segments = spec.version.segments.dup
+      if spec_path.nil?
+        raise "No gemspec found for pattern #{ spec_pattern }"
+      end
+      
+      spec = Gem::Specification.load spec_path
+      
+      # The gem *may already be loaded*, which would break the standard gemspec
+      # approach because the `require` will be a no-op, resulting in the 
+      # already loaded version number being used instead of the one in the
+      # file.
+      # 
+      # This is only a problem for NRSER, which is loaded in vars.rb.rb, but
+      # this fix should work for any module without worrying about what is
+      # currently loaded... grab the info we need in a clean child process.
+      # 
+      code = <<-END
+        require 'json'
+        spec = Gem::Specification.load(#{ JSON.dump spec_path })
+        puts JSON.dump({
+          'version' => spec.version.version,
+          'name' => spec.name,
+        })
+      END
+      obj = JSON.load `ruby -e #{ code.shellescape }`
+      version = Gem::Version.new obj['version']
+      name = obj['name']
+      
+      segments = version.segments.dup
       segments.pop while segments.any? {|s| s.is_a? String}
       
       segments[-1] = segments[-1].succ
@@ -18,24 +45,27 @@
       
       next_version = segments.join('.')
       
-      # match = /^(\d+)\.(\d+)\.(\d+)(\.dev)?$/.match(current_version)
-      
-      # if current_version.ends_with? '.dev'
-      # end
-      
       {
         'name' => name,
-        'current_version' => spec.version.version,
-        'release_version' => spec.version.release,
+        'current_version' => version.version,
+        'release_version' => version.release,
         'next_version' => next_version,
         'version_path' => "#{ qb_dir }/lib/#{ name }/version.rb",
+        'spec_path' => spec_path,
       }
   
 - debug:
-    msg: >
-      current: {{ release_gem_current_version }} | 
-      release: {{ release_gem_release_version }} | 
-      next: {{ release_gem_next_version }}
+    msg:
+    # - spec_path: >-
+    #     {{ release_gem_spec_path }}
+    # - version_path: >-
+    #     {{ release_gem_version_path }}
+    - current: >-
+        {{ release_gem_current_version }}
+    - release: >-
+        {{ release_gem_release_version }}
+    - next: >-
+        {{ release_gem_next_version }}
 
 - name: "change version to release version {{ release_gem_release_version }}"
   replace:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.73
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.17
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: nrser-extras
   requirement: !ruby/object:Gem::Requirement
@@ -288,13 +288,11 @@ files:
 - roles/nrser.rbenv_gem/README.md
 - roles/nrser.rbenv_gem/VERSION
 - roles/nrser.rbenv_gem/defaults/main.yml
-- roles/nrser.rbenv_gem/handlers/main.yml
 - roles/nrser.rbenv_gem/meta/main.yml
 - roles/nrser.rbenv_gem/tasks/clone-repo.yml
 - roles/nrser.rbenv_gem/tasks/main.yml
 - roles/nrser.rbenv_gem/tasks/manage-source.yml
 - roles/nrser.rbenv_gem/tasks/manage-version.yml
-- roles/nrser.rbenv_gem/vars/main.yml
 - roles/nrser.state_mate/.gitignore
 - roles/nrser.state_mate/.rspec
 - roles/nrser.state_mate/README.md
@@ -562,7 +560,7 @@ files:
 - roles/qb.install/defaults/main.yml
 - roles/qb.install/meta/main.yml
 - roles/qb.install/meta/qb.yml
-- roles/qb.install/tasks/create.yml
+- roles/qb.install/tasks/edit.yml
 - roles/qb.install/tasks/git.yml
 - roles/qb.install/tasks/link.yml
 - roles/qb.install/tasks/main.yml

data/roles/nrser.rbenv_gem/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for nrser.rbenv_gem

data/roles/nrser.rbenv_gem/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for nrser.rbenv_gem

data/roles/qb.install/tasks/create.yml

@@ -1,4 +0,0 @@
----
-- name: open new qb role repo in atom
-  shell: "atom {{ install_src }}"
-