qb 0.3.4 → 0.3.5

data/lib/qb/version.rb

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

data/qb.gemspec

@@ -95,7 +95,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   
   spec.add_dependency "cmds",'~> 0.0', ">= 0.2.2"
-  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.22"
+  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.23"
   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/qb/dev/ref/repo/git/defaults/main.yml

@@ -18,14 +18,15 @@ update: false
 owner: >-
   {{ full_name.split('/')[0] }}
 
-name: >-
-  {{ full_path.split('/')[1] }}
+# `name` is a reserved name :/
+repo_name: >-
+  {{ full_name.split('/')[1] }}
 
 full_name: >-
-  {{ owner }}/{{ name }}
+  {{ owner }}/{{ repo_name }}
 
 rel_dest: >-
-  {{ name }}@{{ version }}
+  {{ repo_name }}@{{ version }}
 
 dest: >-
   {{ project_root }}/dev/ref/{{ rel_dest }}

data/roles/qb/dev/ref/repo/git/tasks/main.yml

@@ -14,3 +14,12 @@
       {{ depth }}
     update: >-
       {{ update }}
+
+- name: >-
+    Add a line in //dev/ref/.gitignore to ignore the `{{ rel_dest }}` clone.
+  lineinfile:
+    dest: >-
+      {{ project_root }}/dev/ref/.gitignore
+    line: >-
+      /{{ rel_dest }}
+    create: true

data/roles/qb/yarn/setup/README.md

@@ -0,0 +1,47 @@
+qb/yarn/setup Role
+========================================================================
+
+------------------------------------------------------------------------
+Examples
+------------------------------------------------------------------------
+
+1.  Installing a specific `yarn` version on macOS
+    
+        qb qb/yarn/setup --version=1.0.2
+    
+    This will create a `yarn@1.0.2` Homebrew formula if it doesn't exist.
+    
+    See the [Homebrew Formula Creation](#homebrew-formula-creation) section for more details.
+
+
+------------------------------------------------------------------------
+Homebrew Formula Creation
+------------------------------------------------------------------------
+
+Homebrew for some reason (probably many reasons, I just don't know them) doesn't really work like most package managers that allow you to specify what version you want to install... it kinda just has a current version. Since it can be important to control what version you and the rest of your team are using, we create a Homebrew formula for it (if it doesn't already exist).
+
+The formula is created using the `yarn@M.m.p.rb.j2` template, and is added to the Homebrew tap in the `yarn_setup_brew_tap` variable, which defaults to
+
+    {{ qb_git_user_name }}/versions
+
+which will lead Homebrew to pull the Github repo at
+
+    git@github.com:{{ qb_git_user_name }}/homebrew-versions.git
+
+(or of course the `https` version of the URL, I don't know if using the SSH version is something I personally set up at some point because I use them for everything, but I find stuff tends to default to the `https` ones unless told otherwise.)
+
+So, for myself, the tap would be
+
+    nrser/versions
+
+and the repo would be
+
+    git@github.com:nrser/homebrew-versions.git
+
+**The tap repo is not created if it doesn't already exist!**
+
+You can override `yarn_setup_brew_tap` in Ansible or from the command line with the `-t, --brew-tap=BREW_TAP` option:
+
+    qb qb/yarn/setup --version=1.0.2 --brew-tap=someone-else/versions
+
+

data/roles/{qb.yarn_setup → qb/yarn/setup}/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-# defaults file for qb.yarn_setup
+# defaults file for qb/yarn/setup
 yarn_setup_version: null
 yarn_setup_state: present
 yarn_setup_global_packages: []

data/roles/{qb.yarn_setup → qb/yarn/setup}/meta/main.yml

@@ -1,5 +1,5 @@
 ---
-# meta file for qb.yarn_setup
+# meta file for qb/yarn/setup
 
 allow_duplicates: yes
 

data/roles/{qb.yarn_setup → qb/yarn/setup}/meta/qb.yml

@@ -1,5 +1,5 @@
 ---
-# meta/qb.yml file for qb.yarn_setup
+# meta/qb.yml file for qb/yarn/setup
 # 
 # qb settings for this role. see README.md for more info.
 #
@@ -9,7 +9,7 @@ description: >-
   Install and configure Yarn package manager (for Node).
 
 # prefix for role variables
-var_prefix: null
+var_prefix: yarn_setup
 
 # how to get a default for `dir` if it's not provided as the only
 # positional argument. if a positional argument is provided it will

data/roles/{qb.yarn_setup → qb/yarn/setup}/tasks/distribution/MacOSX/brew_create.yml

@@ -46,7 +46,7 @@
 - name: >-
     Commit new formula to {{ yarn_setup_brew_tap }}
   command: >-
-    git commit -m "qb.yarn_setup added {{ yarn_setup_formula_name }} formula"
+    git commit -m "qb/yarn/setup role added {{ yarn_setup_formula_name }} formula"
   args:
     chdir: "{{ yarn_setup_brew_tap_dir.stdout }}"
 

data/roles/qb/yarn/setup/tasks/distribution/MacOSX/main.yml

@@ -0,0 +1,57 @@
+---
+- name: >-
+    homebrew_name is 'yarn' if no versions is specified,
+    else it is 'yarn@<version>'.
+  set_fact:
+    yarn_setup_brew_name: >-
+      {{ 'yarn@'+yarn_setup_version if yarn_setup_version else 'yarn' }}
+
+
+- name: >-
+    `yarn_setup_can_brew_create` is true when the `yarn_setup_brew_create` 
+    option is `true` and the state is either 'linked' or 'present'.
+  set_fact:
+    yarn_setup_can_brew_create: >-
+      {{ yarn_setup_brew_create and yarn_setup_state == 'present' }}
+
+- debug:
+    msg: >-
+      update_homebrew {{ lookup( 'every', 'update_homebrew', days=1 ) }}
+
+- name: >-
+    Make sure `{{ yarn_setup_brew_name }}` is {{ yarn_setup_state }}
+    on macOS via Homebrew.
+  homebrew:
+    name: >-
+      {{ yarn_setup_brew_name }}
+    state: >-
+      {{ yarn_setup_state }}
+    update_homebrew: >-
+      {{ lookup( 'every', 'update_homebrew', days=1 ) }}
+  # ignore errors if we're in a config where we can create the formula
+  ignore_errors: >-
+    {{ yarn_setup_can_brew_create }}
+  register: yarn_setup_brew_result
+
+# - debug: var=yarn_setup_brew_result
+# 
+# - fail: msg=HERE
+
+
+- when: >-
+    'failed' in yarn_setup_brew_result and
+    yarn_setup_can_brew_create
+  name: >-
+    Create Homebrew formula
+  include: "{{ role_path }}/tasks/distribution/MacOSX/brew_create.yml"
+
+
+- name: >-
+    Link Yarn in Homebrew
+  when: yarn_setup_brew_link
+  homebrew:
+    name: "{{ yarn_setup_brew_name }}"
+    state: linked
+    install_options:
+    - overwrite
+    

data/roles/{qb.yarn_setup → qb/yarn/setup}/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-# tasks file for qb.yarn_setup
+# tasks file for qb/yarn/setup
 
 - name: Manage Yarn installation on MacOSX
   include: "{{ role_path }}/tasks/distribution/{{ ansible_distribution }}/main.yml"

data/roles/qb/yarn/setup/templates/yarn@M.m.p.rb.j2

@@ -0,0 +1,29 @@
+class YarnAT{{ yarn_setup_version | regex_replace('\\D', '') }} < Formula
+  desc "Yarn JavaScript package manager version {{ yarn_setup_version }}"
+  homepage "https://yarnpkg.com/"
+  url "https://github.com/yarnpkg/yarn/releases/download/v{{ yarn_setup_version }}/yarn-v{{ yarn_setup_version }}.tar.gz"
+  head "https://github.com/yarnpkg/yarn.git"
+
+  bottle :unneeded
+
+  depends_on "node" => :recommended
+
+  def install
+    libexec.install Dir["*"]
+    
+    # old way:
+    # bin.install_symlink "#{libexec}/bin/yarn.js" => "yarn"
+    # bin.install_symlink "#{libexec}/bin/yarn.js" => "yarnpkg"
+    
+    # new way: (https://github.com/Homebrew/homebrew-core/commit/b465fc700ad7c617b30c86ed985d0dbbdf9e7455#diff-049797e41058fd9c5475703be58fcb60)
+    (bin/"yarn").write_env_script "#{libexec}/bin/yarn.js", :PREFIX => HOMEBREW_PREFIX
+    (bin/"yarnpkg").write_env_script "#{libexec}/bin/yarn.js", :PREFIX => HOMEBREW_PREFIX
+    
+    inreplace "#{libexec}/package.json", '"installationMethod": "tar"', '"installationMethod": "homebrew"'
+  end
+
+  test do
+    (testpath/"package.json").write('{"name": "test"}')
+    system bin/"yarn", "add", "jquery"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
 - !ruby/object:Gem::Dependency
   name: nrser-extras
   requirement: !ruby/object:Gem::Requirement
@@ -201,8 +201,10 @@ files:
 - lib/qb/ansible/module.rb
 - lib/qb/ansible_module.rb
 - lib/qb/cli.rb
+- lib/qb/cli/help.rb
 - lib/qb/cli/play.rb
 - lib/qb/cli/run.rb
+- lib/qb/cli/setup.rb
 - lib/qb/errors.rb
 - lib/qb/options.rb
 - lib/qb/options/option.rb
@@ -638,13 +640,6 @@ files:
 - roles/qb.yarn_release/meta/main.yml
 - roles/qb.yarn_release/meta/qb.yml
 - roles/qb.yarn_release/tasks/main.yml
-- roles/qb.yarn_setup/defaults/main.yml
-- roles/qb.yarn_setup/meta/main.yml
-- roles/qb.yarn_setup/meta/qb.yml
-- roles/qb.yarn_setup/tasks/distribution/MacOSX/brew_create.yml
-- roles/qb.yarn_setup/tasks/distribution/MacOSX/main.yml
-- roles/qb.yarn_setup/tasks/main.yml
-- roles/qb.yarn_setup/templates/yarn@M.m.p.rb.j2
 - roles/qb/dev/ref/repo/git/defaults/main.yml
 - roles/qb/dev/ref/repo/git/meta/main.yml
 - roles/qb/dev/ref/repo/git/meta/qb.yml
@@ -675,6 +670,14 @@ files:
 - roles/qb/osx/notif/meta/main.yml
 - roles/qb/osx/notif/meta/qb.yml
 - roles/qb/osx/notif/tasks/main.yml
+- roles/qb/yarn/setup/README.md
+- roles/qb/yarn/setup/defaults/main.yml
+- roles/qb/yarn/setup/meta/main.yml
+- roles/qb/yarn/setup/meta/qb.yml
+- roles/qb/yarn/setup/tasks/distribution/MacOSX/brew_create.yml
+- roles/qb/yarn/setup/tasks/distribution/MacOSX/main.yml
+- roles/qb/yarn/setup/tasks/main.yml
+- roles/qb/yarn/setup/templates/yarn@M.m.p.rb.j2
 homepage: https://github.com/nrser/qb
 licenses:
 - MIT

data/roles/qb.yarn_setup/tasks/distribution/MacOSX/main.yml

@@ -1,42 +0,0 @@
----
-- name: >-
-    homebrew_name is 'yarn' if no versions is specified,
-    else it is 'yarn@<version>'
-  set_fact:
-    yarn_setup_brew_name: >-
-      {% if yarn_setup_version -%}
-        yarn@{{ yarn_setup_version }}
-      {%- else -%}
-        yarn
-      {%- endif %}
-
-- name: >-
-    can_brew_create is true when the brew_create option is true and the state
-    is either 'linked' or 'present'
-  set_fact:
-    yarn_setup_can_brew_create: >-
-      {{ yarn_setup_brew_create and yarn_setup_state == 'present' }}
-  
-- name: Manage Yarn installtion state on MacOSX via Homebrew
-  homebrew:
-    name: "{{ yarn_setup_brew_name }}"
-    state: "{{ yarn_setup_state }}"
-    update_homebrew: >-
-      {{ lookup('every', 'update_homebrew', days=1) }}
-  # ignore errors if we're in a config where we can create the formula
-  ignore_errors: "{{ yarn_setup_can_brew_create }}"
-  register: yarn_setup_brew_result
-
-- name: Create Homebrew formula
-  when: >-
-    yarn_setup_brew_result.failed and yarn_setup_can_brew_create
-  include: "{{ role_path }}/tasks/distribution/MacOSX/brew_create.yml"
-
-- name: Link Yarn in Homebrew
-  when: yarn_setup_brew_link
-  homebrew:
-    name: "{{ yarn_setup_brew_name }}"
-    state: linked
-    install_options:
-    - overwrite
-    

data/roles/qb.yarn_setup/templates/yarn@M.m.p.rb.j2

@@ -1,22 +0,0 @@
-class YarnAT{{ yarn_setup_version | regex_replace('\\D', '') }} < Formula
-  desc "JavaScript package manager"
-  homepage "https://yarnpkg.com/"
-  url "https://github.com/yarnpkg/yarn/releases/download/v{{ yarn_setup_version }}/yarn-v{{ yarn_setup_version }}.tar.gz"
-  head "https://github.com/yarnpkg/yarn.git"
-
-  bottle :unneeded
-
-  depends_on "node"
-
-  def install
-    libexec.install Dir["*"]
-    bin.install_symlink "#{libexec}/bin/yarn.js" => "yarn"
-    bin.install_symlink "#{libexec}/bin/yarn.js" => "yarnpkg"
-    inreplace "#{libexec}/package.json", '"installationMethod": "tar"', '"installationMethod": "homebrew"'
-  end
-
-  test do
-    (testpath/"package.json").write('{"name": "test"}')
-    system bin/"yarn", "add", "jquery"
-  end
-end