qb 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ff12a6480515c8ce9f9ec5416d8f27a0ea58e4
-  data.tar.gz: b7a8a742e2122159ffc4b46912466a726ad762e2
+  metadata.gz: c148a94c7547523edbf2258879d61a34316ef84a
+  data.tar.gz: 446d188612b882cb0f6ce4ef8b670161c6b1734a
 SHA512:
-  metadata.gz: 578c5273900a9f95cc310a85a6e1036fa0b056585aa8c48ca4573d9ec218a81f118b4ebe08b5ec46bdf345962de08843f21e72e64a6151e8f446a07c14a4f76d
-  data.tar.gz: 67d1ab031ee43fa22e826a678041fb2d97aaf75153f29535396918878738eee71c4704ab94d153436a267c56d0db0a4df42ba0e0bea3364918d0118d1d156312
+  metadata.gz: 2c6aaac0da8e6c48efb3d507d28b8f4d63b9539d54973c55d0644ea3e690cb5c1fdba83569b80159b8c0fc03791bb234b34d341325d871ebc1b9e7c9e236ce1b
+  data.tar.gz: 392448a4c0750de37ccab9976c1ce1f0e7e8980d14f3349d80181f108166d759956fcbf157a7de480194ce06ccb9aa9cf5f9bc7145720d40d42e1fe1667f1e29

data/.gitignore

@@ -1,5 +1,5 @@
 # temp playbook created by qb for ansible-playbook to consume
-/.qb-playbook.yml
+.qb-playbook.yml
 
 /dev/repos
 /dev/ref/tmp

data/bin/print-error

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+# parses and prints a fatal error out of ansible-playbook output
+# 
+# usage:
+# 
+#     qb some_role . | print-error
+# 
+
+require 'json'
+require 'pp'
+
+out = STDIN.read
+
+json = out[/FAILED\!\ \=\>\ (\{.*\})\n/, 1]
+
+data = JSON.load json
+stderr = data['module_stderr']
+
+# pp data
+
+puts "STDERR:\n\n"
+
+puts stderr

data/exe/qb

@@ -48,11 +48,49 @@ def set_debug! args
   end
 end
 
-# needed for to clean the env if using bundler (like in dev)
+# needed for to clean the env if using bundler (like in dev).
+# 
+# this is because the ansible gem module doesn't work right with the bundler
+# env vars set, so we need to remove them, but when running in dev we want
+# modules written in ruby like nrser.state_mate's `state` script to have
+# access to them so it can fire up bundler and get the right libraries.
+# 
+# to accomplish this, we detect Bundler, and when it's present we copy the
+# bundler-related env vars (which i found by looking at 
+# https://github.com/bundler/bundler/blob/master/lib/bundler.rb#L257)
+# into a hash to pass around the env sanitization, then copy them into
+# corresponding 'QB_DEV_ENV_<NAME>' vars that modules can restore.
+# 
+# we also set a 'QB_DEV_ENV=true' env var for modules to easily detect that
+# we're running in dev and restore the variables.
+# 
 def with_clean_env &block
   if defined? Bundler
-    Bundler.with_clean_env &block
+    # copy the Bundler env vars into a hash
+    dev_env = ENV.select {|k, v|
+      k.start_with?("BUNDLE_") ||
+      [
+        'GEM_HOME',
+        'GEM_PATH',
+        'MANPATH',
+        'RUBYOPT',
+        'RUBYLIB',
+      ].include?(k)
+    }
+    
+    Bundler.with_clean_env do
+      # now that we're in a clean env, copy the Bundler env vars into 
+      # 'QB_DEV_ENV_<NAME>' vars.
+      dev_env.each {|k, v| ENV["QB_DEV_ENV_#{ k }"] = v}
+      
+      # and set QB_DEV_ENV=true
+      ENV['QB_DEV_ENV'] = 'true'
+      
+      # invoke the block
+      block.call
+    end
   else
+    # bundler isn't loaded, so no env var silliness to deal with 
     block.call
   end
 end
@@ -278,10 +316,8 @@ def main args
     ROOT + 'library',
   ].join(':')
   
-  Dir.chdir QB::ROOT do
-    # the `gem` ansible module doesn't work right when the bundler env vars 
-    # are set... so we need to clear them.
-    with_clean_env do
+  Dir.chdir QB::ROOT do    
+    with_clean_env do      
       template = []
       template << "ANSIBLE_ROLES_PATH=<%= roles_path %>"
       template << "ANSIBLE_LIBRARY=<%= library_path %>"

data/lib/qb/version.rb

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

data/qb.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency "cmds",'~> 0.0', ">= 0.0.9"
   spec.add_dependency "nrser-extras", '~> 0.0', ">= 0.0.3"
-  spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.8"
+  spec.add_dependency "state_mate", '~> 0.0', ">= 0.0.9"
   
   
   if QB::VERSION.end_with? '.dev'

data/roles/nrser.state_mate/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/roles/nrser.state_mate/defaults/main.yml

@@ -1,3 +1,3 @@
 ---
 # defaults file for nrser.state_mate
-state_mate_version: 0.0.8
+state_mate_version: 0.0.9

data/roles/nrser.state_mate/library/state

@@ -1,35 +1,30 @@
 #!/usr/bin/env ruby
 # WANT_JSON
 
-
-# def in_bundle?
-  
-
-# conditionally setup bundler if we're in a bundle
-# 
-# if 
-#   require 'bundler/setup'
-# rescue Exception => e
-# end
-
-require 'json'
-require 'shellwords'
-require 'pp'
-require 'yaml'
-
 # ugh... we need to clear the bundler env vars before running
-# `ansible-playbook` because they break the `git` ansible modules.
+# `ansible-playbook` because they break the `git` ansible modules, so we
+# don't have the bundler env vars here when we're in dev.
 # 
-# so, what we'll do is just try to require the first gem, and if it fails,
-# require bundler and try again...
+# what we do is have exe/qb copy all the bundler env vars to
+# `QB_DEV_ENV_<NAME` ones around the env sanitization, along with adding
+# `QB_DEV_ENV=true`. then we pick those up here and restore them.
 # 
-begin
-  require 'nrser'
-rescue LoadError => e
+if ENV['QB_DEV_ENV']
+  ENV.each {|k, v|
+    if k.start_with? 'QB_DEV_ENV_'
+      ENV[k.sub('QB_DEV_ENV_', '')] = v
+    end
+  }
+  
   require 'bundler/setup'
-  require 'nrser'
 end
 
+require 'pp'
+require 'json'
+require 'shellwords'
+require 'yaml'
+
+require 'nrser'
 require 'state_mate'
 require 'state_mate/adapters/yaml'
 

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

@@ -30,6 +30,5 @@
   state:
     json:
       key: "{{ npm_package_json_path }}:scripts:{{ item.key }}"
-      set: "{{ item.value }}"
-      create: true
+      init: "{{ item.value }}"
   with_dict: "{{ npm_package_scripts }}"

data/roles/qb.nrser_js/files/gulpfile.js

@@ -1,5 +1,5 @@
 const gulp = require('gulp');
-const Ugh = require('nrser/lib/ugh').Ugh;
+const Ugh = require('@nrser/ugh').Ugh;
 
 const ugh = new Ugh({gulp, packageDir: __dirname});
 

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

@@ -5,13 +5,8 @@ allow_duplicates: yes
 
 dependencies:
 - role: nrser.state_mate
-
-- role: qb.npm_package
   
 - role: qb.npm_package
   npm_package_main: lib/index.js
-  npm_package_scripts:
-    clean: gulp clean
-    build: "gulp build"
-    test: "gulp mocha"
-    watch: "gulp watch"
+  npm_package_scripts: "{{ nrser_js_package_scripts }}"
+  

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

@@ -5,7 +5,7 @@
   state:
     json:
       key: "{{ npm_package_json_path }}:dependencies:{{ item.key }}"
-      set: "{{ item.value }}"
+      init: "{{ item.value }}"
       create: true
   with_dict: "{{ nrser_js_deps }}"
 
@@ -13,7 +13,7 @@
   state:
     json:
       key: "{{ npm_package_json_path }}:devDependencies:{{ item.key }}"
-      set: "{{ item.value }}"
+      init: "{{ item.value }}"
       create: true
   with_dict: "{{ nrser_js_dev_deps }}"
 

data/roles/qb.nrser_js/vars/main.yml

@@ -3,10 +3,11 @@
 
 nrser_js_deps:
   lodash: "^4.16.2"
-  nrser: "^0.3.1"
+  nrser: "^0.5.0"
   tcomb: "^3.2.15"
 
 nrser_js_dev_deps:
+  "@nrser/ugh": "^0.1.6"
   babel-cli: "^6.16.0"
   babel-core: "^6.17.0"
   babel-plugin-metalog: "^0.1.0"
@@ -26,3 +27,10 @@ nrser_js_dev_deps:
   kexec: "^3.0.0"
   mocha: "^3.1.2"
   node-notifier: "^4.6.1"
+
+nrser_js_package_scripts:
+  clean: gulp clean
+  build: "gulp build:this"
+  build-all: gulp build
+  test: gulp mocha
+  watch: gulp watch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
 description: 
 email:
 - neil@ztkae.com
@@ -131,6 +131,7 @@ files:
 - Rakefile
 - ansible.cfg
 - bin/console
+- bin/print-error
 - bin/qb
 - bin/setup
 - bin/ungem
@@ -240,8 +241,6 @@ files:
 - roles/nrser.rbenv_gem/vars/main.yml
 - roles/nrser.state_mate/.gitignore
 - roles/nrser.state_mate/.rspec
-- roles/nrser.state_mate/Gemfile
-- roles/nrser.state_mate/Gemfile.lock
 - roles/nrser.state_mate/README.md
 - roles/nrser.state_mate/VERSION
 - roles/nrser.state_mate/defaults/main.yml

data/roles/nrser.state_mate/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-group :test, :development do
-  gem "rspec"
-  gem "cmds"
-  gem "nrser-extras"
-  gem "state_mate", path: "#{ ENV.fetch('GITHUB_ROOT') }/nrser/state_mate"
-end

data/roles/nrser.state_mate/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: /Users/nrser/dev/gh/nrser/state_mate
-  specs:
-    state_mate (0.0.7.dev)
-      CFPropertyList (~> 2.3)
-      cmds (~> 0.0, >= 0.0.9)
-      nrser (~> 0.0, >= 0.0.13)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.2)
-    cmds (0.0.9)
-      erubis (~> 2.7)
-      nrser (>= 0.0.13)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    nrser (0.0.13)
-    nrser-extras (0.0.3)
-      cmds (>= 0.0.7)
-      nrser (>= 0.0.13)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cmds
-  nrser-extras
-  rspec
-  state_mate!
-
-BUNDLED WITH
-   1.10.6