qb 0.1.42 → 0.1.43

data/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "qb",
+  "version": "0.0.0",
+  "main": "index.js",
+  "repository": "git@github.com:nrser/qb.git",
+  "author": "nrser <neil@ztkae.com>",
+  "license": "see LICENSE.txt",
+  "dependencies": {
+    "semver": "^5.3.0"
+  }
+}

data/plugins/filter_plugins/version.py

@@ -0,0 +1,63 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import subprocess
+import os
+
+from ansible.errors import AnsibleError
+
+
+QB_ROOT = os.path.realpath(
+    os.path.join(
+        os.path.dirname(os.path.realpath(__file__)), # /plugins/filter_plugins
+        '..', # /plugins
+        '..', # /
+    )
+)
+
+
+def semver_inc(version, level = None, preid = None):
+    '''increment the version at level, with optional preid for pre- levels.
+    
+    runs
+    
+        semver --increment <level> [--preid <preid>] <version>
+    
+    >>> semver_inc('1.0.0', 'minor', preid = 'dev')
+    '1.0.1-dev.0'
+    
+    '''
+    
+    cmd = [
+        os.path.join(QB_ROOT, 'node_modules', '.bin', 'semver'),
+        '--increment',
+    ]
+    
+    if not (level is None):
+        cmd.append(level)
+    
+    if not (preid is None):
+        cmd.append('--preid')
+        cmd.append(preid)
+    
+    cmd.append(version)
+    
+    out = subprocess.check_output(cmd)
+    
+    return out.rstrip()
+
+
+class FilterModule(object):
+    ''' version manipulation filters '''
+
+    def filters(self):
+        return {
+            'semver_inc': semver_inc,
+        }
+
+
+# testing - call camel_case on first cli arg and print result
+if __name__ == '__main__':
+    import doctest
+    doctest.testmod()
+    

data/qb.gemspec

@@ -1,8 +1,40 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+require 'pathname'
+
+GEM_ROOT = File.expand_path(File.dirname(__FILE__))
+lib = File.join(GEM_ROOT, 'lib')
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'qb/version'
 
+# things not to package (String | Regexp)
+OMIT_FILES = [
+  # standard gem ignores (test files)
+  %r{^(test|spec|feature)/},
+  # all the development files
+  %r{^dev/},
+  # all the temp files
+  %r{^tmp/},
+  # dotfiles / dev config
+  '.gitignore',
+  '.gitmodules',
+  '.qb-options.yml',
+  '.rspec',
+  '.travis.yml',
+  # don't think we need this *in* the gem - it's for bundler in dev
+  'Gemfile',
+  # dev executables are in /bin (gem executables are in /exe)
+  %r{^bin/},
+  # yarn artifacts
+  'yarn.lock',
+  'node_modules/.yarn-integrity',
+  # nrser.blockinfile tests carried over from fork
+  %r{^roles/nrser.blockinfile/tests/},
+  # temp playbook used in development
+  'temp.yml',
+  # don't think we need the Rakefile
+  'Rakefile',
+]
+
 Gem::Specification.new do |spec|
   spec.name          = QB::GEM_NAME
   spec.version       = QB::VERSION
@@ -14,7 +46,26 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/nrser/qb"
   spec.license       = "MIT"
   
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  checked_in_files = `git ls-files -z`.split("\x0")
+  
+  node_modules_files = Dir.glob(
+    File.join(GEM_ROOT, 'node_modules/**/*'), File::FNM_DOTMATCH
+  ).map {|abs_path|
+    Pathname.new(abs_path).relative_path_from(Pathname.new(GEM_ROOT)).to_s
+  }
+  
+  spec.files         = (checked_in_files + node_modules_files).reject {|fp|
+    OMIT_FILES.any? {|pattern|
+      case pattern
+      when String
+        fp == pattern
+      when Regexp
+        pattern.match fp
+      else
+        raise "bad pattern: #{ pattern.inspect }"
+      end
+    }
+  }
   
   # get an array of submodule dirs by executing 'pwd' inside each submodule
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"

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

@@ -0,0 +1,4 @@
+---
+# defaults file for qb.release_yarn
+release_yarn_level: patch
+release_yarn_package_dir: "{{ qb_dir }}"

data/{dev/scratch/empty → roles/qb.release_yarn}/meta/main.yml

@@ -1,5 +1,5 @@
 ---
-# meta file for empty
+# meta file for qb.release_yarn
 
 allow_duplicates: yes
 

data/{dev/scratch/stdio → roles/qb.release_yarn}/meta/qb.yml

@@ -1,5 +1,5 @@
 ---
-# meta/qb.yml file for stdio
+# meta/qb.yml file for qb.release_yarn
 # 
 # qb settings for this role. see README.md for more info.
 #
@@ -18,6 +18,8 @@ var_prefix: null
 # 
 # -   null
 #     -   require the value on the command line.
+# -   false
+#     -   don't provide qb_dir (means doesn't load or save options either).
 # -   git_root
 #     -   use the git root fof the directory that the `qb` command is invoked
 #         from. useful for 'project-centric' commands so they can be invoked
@@ -28,13 +30,13 @@ var_prefix: null
 #     -   invoke an execuable, passing a JSON serialization of the options 
 #         mapping their CLI names to values. path can be relative to role
 #         directory.
-default_dir: cwd
+default_dir: null
 
 # default user to become for play
 default_user: null
 
 # set to false to not save options in .qb-options.yml files
-save_options: false
+save_options: true
 
 options:
 # - name: example
@@ -42,14 +44,17 @@ options:
 #   required: false
 #   type: boolean # boolean (default) | string
 #   short: e
-- name: raise
-  description: raise an error in main.
-  required: false
-  type: boolean
-  short: r
 
-- name: count
-  description: count to 10 on stdout with 1 sec sleeps between
+- name: level
+  short: l
+  description: level to increment version.
   required: false
-  type: boolean
-  short: c
+  type:
+    one_of:
+    - major
+    - minor
+    - patch
+    - premajor
+    - preminor
+    - prepatch
+    - prerelease

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

@@ -0,0 +1,74 @@
+---
+# tasks file for qb.release_yarn
+
+- name: load package.json
+  include_vars:
+    file: "{{ release_yarn_package_dir }}/package.json"
+    name: release_gem_package_json
+
+- name: get current version
+  set_fact:
+    release_yarn_current_version: "{{ release_gem_package_json.version }}"
+
+- name: create release version
+  set_fact:
+    release_yarn_release_version: "{{
+      release_yarn_current_version | semver_inc(release_yarn_level)
+    }}"
+
+- name: >
+    increment to version {{ release_yarn_release_version }}
+    and create the git tag
+  command: "yarn version --new-version={{ release_yarn_release_version }}"
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: >
+    git push the v{{ release_yarn_release_version }} tag
+  command: "git push origin v{{ release_yarn_release_version }}"
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: >
+    npm publish v{{ release_yarn_release_version }}
+  command: npm publish
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: create the next -dev version
+  set_fact:
+    release_yarn_next_version: "{{
+      release_yarn_release_version | semver_inc(
+        level='prerelease',
+        preid='dev'
+      )
+    }}"
+
+- name: >
+    increment to {{ release_yarn_next_version }} version
+  command: >
+    yarn version
+      --new-version={{ release_yarn_next_version }}
+      --no-git-tag-version
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: git add package.json
+  command: git add package.json
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: >
+    git commit next dev version
+  command: git commit -m "start {{ release_yarn_next_version }}"
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- name: git push next dev version
+  command: git push
+  args:
+    chdir: "{{ release_yarn_package_dir }}"
+
+- debug:
+    msg: >
+      v{{ release_yarn_package_dir }} released.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,54 +140,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
-- ".qb-options.yml"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - ansible.cfg
-- bin/console
-- bin/print-error
-- bin/qb
-- bin/rake
-- bin/setup
-- bin/ungem
-- dev/ansible.cfg
-- dev/hosts
-- dev/requirements.yml
-- dev/scratch/README.md
-- dev/scratch/ansible_module/defaults/main.yml
-- dev/scratch/ansible_module/library/test
-- dev/scratch/ansible_module/meta/main.yml
-- dev/scratch/ansible_module/meta/qb.yml
-- dev/scratch/ansible_module/tasks/main.yml
-- dev/scratch/case.rb
-- dev/scratch/empty/defaults/main.yml
-- dev/scratch/empty/meta/main.yml
-- dev/scratch/empty/meta/qb.yml
-- dev/scratch/empty/tasks/main.yml
-- dev/scratch/options/Gemfile
-- dev/scratch/options/Gemfile.lock
-- dev/scratch/options/aliases/README.md
-- dev/scratch/options/aliases/optparse.rb
-- dev/scratch/options/types/README.md
-- dev/scratch/options/types/opts.yml
-- dev/scratch/options/types/slop.rb
-- dev/scratch/stateSpec.js
-- dev/scratch/stdio/defaults/main.yml
-- dev/scratch/stdio/library/test
-- dev/scratch/stdio/meta/main.yml
-- dev/scratch/stdio/meta/qb.yml
-- dev/scratch/stdio/tasks/main.yml
-- dev/scratch/stream/defaults/main.yml
-- dev/scratch/stream/meta/main.yml
-- dev/scratch/stream/meta/qb.yml
-- dev/scratch/stream/tasks/main.yml
-- dev/setup.yml
 - exe/qb
 - lib/qb.rb
 - lib/qb/ansible_module.rb
@@ -200,7 +155,16 @@ files:
 - library/git_mkdir.py
 - library/qb_facts.py
 - library/stream
+- node_modules/.bin/semver
+- node_modules/semver/LICENSE
+- node_modules/semver/README.md
+- node_modules/semver/bin/semver
+- node_modules/semver/package.json
+- node_modules/semver/range.bnf
+- node_modules/semver/semver.js
+- package.json
 - plugins/filter_plugins/string.py
+- plugins/filter_plugins/version.py
 - qb.gemspec
 - roles/nrser.blockinfile/CONTRIBUTING.md
 - roles/nrser.blockinfile/README.md
@@ -571,6 +535,10 @@ files:
 - roles/qb.release_gem/meta/main.yml
 - roles/qb.release_gem/meta/qb.yml
 - roles/qb.release_gem/tasks/main.yml
+- roles/qb.release_yarn/defaults/main.yml
+- roles/qb.release_yarn/meta/main.yml
+- roles/qb.release_yarn/meta/qb.yml
+- roles/qb.release_yarn/tasks/main.yml
 - roles/qb.role/.qb-options.yml
 - roles/qb.role/defaults/main.yml
 - roles/qb.role/meta/main.yml
@@ -594,8 +562,6 @@ files:
 - roles/qb.vars/meta/main.yml
 - roles/qb.vars/meta/qb.yml
 - roles/qb.vars/tasks/main.yml
-- temp.yml
-- tmp/.gitkeep
 homepage: https://github.com/nrser/qb
 licenses:
 - MIT

data/.gitignore

@@ -1,176 +0,0 @@
-# temp playbook created by qb for ansible-playbook to consume
-.qb-playbook.yml
-
-/dev/repos
-/dev/ref/tmp
-/tmp
-
-##############################################################################
-# BEGIN Global/OSX.gitignore
-#
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two 
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-#
-# END Global/OSX.gitignore
-##############################################################################
-
-##############################################################################
-# BEGIN Ruby.gitignore
-#
-/*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-#
-# END Ruby.gitignore
-##############################################################################
-
-##############################################################################
-# BEGIN Gem.gitignore
-#
-/Gemfile.lock
-/.ruby-version
-/.ruby-gemset
-#
-# END Gem.gitignore
-##############################################################################
-
-##############################################################################
-# BEGIN Python.gitignore
-#
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-# lib/ (needed for ruby gem)
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-#Ipython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-#
-# END Python.gitignore
-##############################################################################
-/dev/roles/tmp