qb 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826c3553e9e69c10b5f413f9d72a3dd24467886a
-  data.tar.gz: 147cb053b57b0190f6874de992bc8eec0f5b1dec
+  metadata.gz: 85f1f3cd75304ea28284a8a7e9cea53dcae4c7f2
+  data.tar.gz: ccd49744cc2b48260201e38bed1776998ab3b13d
 SHA512:
-  metadata.gz: 2f66deb75554195bb7949d44c9bbe08ec9103cb40cdaf383d9a5aefe99e449a80d58fee7b6ca8471ba53f934b1da16db4d30d7576a195b14000873618a381c27
-  data.tar.gz: 11d2976e88461d1c61cfe6036078e3e077bba0825118d3726c92197dcec58eeb0dad0ce4e8887c801812fb57b891f1dbf954cf2aa6caa1c1277a701063a78d5d
+  metadata.gz: 6a8f68092bb909d9a743c22c76e1a7c3a183105b45da634a19e6d428a6282363299d7d0033ea866e45b870a72f3e47098e1806290b8735d385ccd391a3f382ac
+  data.tar.gz: 2251cdc6d535d543826906478caa30b277e243695b980f40d18d5c8def5bf9630fe904c3bc046f605224b9e82027981fcc05a86892228941bd06d6901d8eca33

data/lib/qb/version.rb

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

data/roles/qb/ruby/gem/release/defaults/main.yml

@@ -3,3 +3,5 @@
 
 gem_root: >-
   {{ qb_dir }}
+
+gem_version_file: null

data/roles/qb/ruby/gem/release/meta/qb.yml

@@ -25,3 +25,10 @@ options:
 #   required: false
 #   type: boolean # boolean (default) | string
 #   short: e
+
+- name: version_file
+  var_name: gem_version_file
+  description: >-
+    Specify where the version file is for cases where it can't be inferred
+  required: false
+  type: path

data/roles/qb/ruby/gem/release/tasks/main.yml

@@ -1,6 +1,18 @@
 ---
 # tasks file for qb/ruby/gem/release
 
+# NOTE  We do this because the `release` Rake task `bundler/gem_tasks`
+#       provides **will** fail if there are any uncommitted files...
+#       which is annoying as all hell when the dirt is just a dev submod that
+#       is not used in the release version, but there does not seem to be
+#       any options to ignore files or paths:
+#       
+#       https://github.com/bundler/bundler/blob/c4fc79a2bfed38335a3371300bea49286a371d83/lib/bundler/gem_helper.rb#L151
+#       
+#       So, we do the check first so we don't both with anything else if it's
+#       going to fail (and it's the most common thing that gets in the way,
+#       so it's nice to catch it early).
+#       
 - name: >-
     Check that the git repo at {{ gem_root }} is clean.
   include_role:
@@ -49,6 +61,8 @@
     namespace: gem
     bind:
       gem_root: "{{ gem_root }}"
+      version_file: "{{ gem_version_file }}"
+      cwd: "{{ qb_cwd }}"
     src: |
       spec_pattern = "#{ gem_root }/*.gemspec"
       spec_path = Dir.glob(spec_pattern)[0]
@@ -86,12 +100,25 @@
       
       next_version = segments.join('.')
       
+      version_path = if version_file.nil?
+        # quick hack to deal with `a-b => a/b` gem names
+        name_path = name.gsub '-', '/'
+        
+        File.join gem_root, 'lib', name_path, 'version.rb'
+      else
+        File.expand_path version_file, cwd
+      end
+      
+      unless File.file?( version_path )
+        raise "Version file not found at #{ version_path }"
+      end
+      
       {
         'name' => name,
         'current_version' => version.version,
         'release_version' => version.release,
         'next_version' => next_version,
-        'version_path' => "#{ gem_root }/lib/#{ name }/version.rb",
+        'version_path' => version_path,
         'spec_path' => spec_path,
       }
 
@@ -107,7 +134,7 @@
     # - spec_path: >-
     #     {{ gem_spec_path }}
     # - version_path: >-
-    #     {{ gem_version_path }}
+    #     {{ gem_version_path }
 
 
 - when: gem_current_version != gem_release_version
@@ -126,14 +153,14 @@
         VERSION = "{{ gem_release_version }}"
   
   
-  - name: >-
+  - when: gem_current_version != gem_release_version
+    name: >-
       Add version file `{{ gem_version_path }}` to Git.
     command: >-
       git add {{ gem_version_path }}
     args:
       chdir: >-
         {{ gem_root }}
-    when: gem_current_version != gem_release_version
 
   
   - name: >-

data/roles/qb/ruby/gem/release/tasks/release.yml

@@ -33,10 +33,10 @@
   stream:
     chdir: >-
       {{ gem_root }}
-    stream:
-      log: true
-      cmd: bundle exec ruby -e <%= script %>
-      kwds:
-        script: |
-          Bundler::GemHelper.install_tasks
-          Rake::Task['release'].execute
+    log: true
+    cmd: bundle exec ruby
+    input: |
+      require 'rake'
+      require 'bundler/gem_tasks'
+      
+      Rake::Task['release'].invoke

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler