qb 0.3.1 → 0.3.2

data/lib/qb/version.rb

@@ -4,7 +4,7 @@ module QB
   
   GEM_NAME = 'qb'
   
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
   
   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.1"
-  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.20"
+  spec.add_dependency "nrser",'~> 0.0', ">= 0.0.21"
   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.project/tasks/main.yml

@@ -29,6 +29,7 @@
   lineinfile:
     line: /tmp
     dest: "{{ project_dest }}/.gitignore"
+    create: true
   when: project_tmp
 
 # readme

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

@@ -1,8 +1,10 @@
 ---
 role_dest: "{{ qb_dir }}"
 role_force: false
-# can't be named `role_name` 'cause ansible sets that?
+
+# can't be named `role_name` 'cause Ansible sets that?
 role_role_name: "{{ role_dest | basename }}"
+
 role_defaults: true
 role_files: false
 role_handlers: false

data/roles/qb/gem/new/defaults/main.yml

@@ -0,0 +1,12 @@
+---
+# defaults file for qb/gem/new
+
+gem_is_project: false
+
+gem_root: >-
+  {{ qb_dir }}
+
+gem_name: >-
+  {{ gem_root | basename }}
+
+force: false

data/roles/{qb.git_check_clean → qb/gem/new}/meta/main.yml

@@ -1,5 +1,5 @@
 ---
-# meta file for qb.git_check_clean
+# meta file for qb/gem/new
 
 allow_duplicates: yes
 

data/roles/qb/gem/new/meta/qb.yml

@@ -0,0 +1,90 @@
+---
+# meta/qb.yml file for qb/gem/new
+# 
+# qb settings for this role. see README.md for more info.
+#
+
+# description of the role to show in it's help output.
+description: >-
+  Create a new Ruby gem, optionally as it's own project.
+
+# Gemspec-style requirements. Right now only `gems:qb` is used, but plan to
+# generalize in the future.
+requirements:
+  gems:
+    qb: ~> 0.3.0
+
+# prefix for role variables
+var_prefix: gem
+
+# 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
+# override the method defined here.
+# 
+# options:
+# 
+# -   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
+#         from anywhere in the repo.
+# -   cwd
+#     -   use the directory the `qb` command is invoked form.
+# -   {exe: PATH}
+#     -   invoke an execuable, passing a JSON serialization of the options 
+#         mapping their CLI names to values. path can be relative to role
+#         directory.
+# -   {find_up: FILENAME}
+#     -   starting at the current direcotry and climbing up to parent 
+#         directories, use the first one that contains FILENAME. error
+#         if none is found.
+default_dir: null
+
+# If `true`, QB will ensure the default dir exists before starting the play.
+# 
+# For legacy reasons, this defaults to `true` if not present, but we want to 
+# default declare it as `false` here so new roles can turn it on only if 
+# they need it.
+# 
+mkdir: false
+
+# default user to become for play
+default_user: null
+
+# set to false to not save options in .qb-options.yml files
+save_options: true
+
+# options to pass to ansible-playbook
+ansible_options: {}
+
+options:
+# - name: example
+#   description: an example of a variable.
+#   required: false
+#   type: boolean # boolean (default) | string
+#   short: e
+
+- name: name
+  description: >-
+    Name of the new gem.
+  type: string
+  short: n
+
+- name: is_project
+  description: >-
+    Structure the gem as a project.
+  type: boolean
+  short: p
+
+- include: qb.project
+  as: false
+
+- name: force
+  var_name: force
+  description: >-
+    Override existing files with newly generated ones.
+  type: boolean
+  short: f

data/roles/qb/gem/new/tasks/bundle_gem.yml

@@ -0,0 +1,97 @@
+---
+# Run `bundle gem <gem_name>` targeting a temp directory, then merge the
+# results into `gem_root`.
+
+- name: >-
+    Create a tempdir to run `bundle gem {{ gem_name }}` in.
+  tempfile:
+    state: directory
+    suffix: gem
+  register: tempdir
+  changed_when: false
+
+
+- name: >-
+    Run `bundle gem {{ gem_name }}` in tempdir `{{ tempdir.path }}`.
+  stream:
+    cmd: >-
+      bundle gem %{gem_name}
+    kwds:
+      gem_name: >-
+        {{ gem_name }}
+    chdir: >-
+      {{ tempdir.path }}
+  changed_when: false
+
+
+- name: >-
+    Get rid of the `.git` directory and `.gitignore` file since we don't want 
+    to merge them.
+  with_items:
+  - .git
+  - .gitignore
+  file:
+    path: >-
+      {{ tempdir.path | path_join(gem_name, item) }}
+    state: absent
+  changed_when: false
+
+
+- name: >-
+    Create destination directories in gem root `{{ gem_root }}`.
+  with_filetree: >-
+    {{ tempdir.path | path_join(gem_name) }}
+  when: item.state == 'directory'
+  file:
+    dest: >-
+      {{ gem_root | path_join(item.path) }}
+    state: directory
+  changed_when: false
+
+
+- name: >-
+    Copy files from tempdir to gem root `{{ gem_root }}`.
+  with_filetree: >-
+    {{ tempdir.path | path_join(gem_name) }}
+  when: item.state == 'file'
+  copy:
+    src: >-
+      {{ item.src }}
+    dest: >-
+      {{ gem_root | path_join(item.path) }}
+    force: >-
+      {{ force }}
+
+
+# Prob don't need this, but what the hell...
+#       
+# From
+# 
+#   http://docs.ansible.com/ansible/latest/playbooks_loops.html#looping-over-filetrees
+# 
+# along with the rest of it. Seem to work for relative symlinks.
+# 
+- name: >-
+    Recreate symlinks from tempdir to gem root `{{ gem_root }}`.
+  with_filetree: >-
+    {{ tempdir.path | path_join(gem_name) }}
+  when: item.state == 'link'
+  file:
+    src: >-
+      {{ item.src }}
+    dest: >-
+      {{ gem_root | path_join(item.path) }}
+    state: link
+    force: >-
+      {{ force }}
+    mode: >-
+      {{ item.mode }}
+
+
+- name: >-
+    Remove the temp dir at `{{ tempdir.path }}`.
+  file:
+    path: >-
+      {{ tempdir.path }}
+    state: absent
+  changed_when: false

data/roles/qb/gem/new/tasks/main.yml

@@ -0,0 +1,22 @@
+---
+# tasks file for qb/gem/new
+
+- include: >-
+    {{ role_path }}/tasks/bundle_gem.yml
+
+- name: >-
+    Add gitignore blocks.
+  with_items:
+  - Ruby
+  - Gem
+  include_role:
+    name: qb.gitignore
+  vars:
+    gitignore_name: >-
+      {{ item }}
+
+- when: gem_is_project
+  name: >-
+    Include `qb.project` role.
+  include_role:
+    name: qb.project

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

@@ -0,0 +1,5 @@
+---
+# defaults file for qb/gem/release
+
+gem_root: >-
+  {{ qb_dir }}

data/roles/{qb.release_gem → qb/gem/release}/meta/main.yml

@@ -1,5 +1,5 @@
 ---
-# meta file for qb.release_gem
+# meta file for qb/gem/release
 
 allow_duplicates: yes
 

data/roles/{qb.release_gem → qb/gem/release}/meta/qb.yml

@@ -1,5 +1,5 @@
 ---
-# meta/qb.yml file for qb.release_gem
+# meta/qb.yml file for qb/gem/release
 # 
 # qb settings for this role. see README.md for more info.
 #
@@ -10,7 +10,7 @@ var_prefix: null
 # how to get a default for `dir` if it's not provided as the 
 default_dir: null
 
-# set to false to not save options in /Users/nrser/dev/gh/nrser/qb/roles/qb.release_gem/.qb-options.yml
+# set to false to not save options in /Users/nrser/dev/gh/nrser/qb/roles/qb/gem/release/.qb-options.yml
 save_options: true
 
 vars: []

data/roles/{qb.release_gem → qb/gem/release}/tasks/main.yml

@@ -1,13 +1,31 @@
 ---
-# tasks file for qb.release_gem
+# tasks file for qb/gem/release
 
-- name: get gem and version info
+- name: >-
+    Check that the git repo at {{ gem_root }} is clean.
+  include_role:
+    name: qb/git/check/clean
+  vars:
+    git_root: >-
+      {{ gem_root }}
+
+
+- name: >-
+    Do a `bundle install`.
+  bundler:
+    state: present
+    chdir: >-
+      {{ gem_root }}
+
+
+- name: >-
+    Get gem and version info
   vars.rb:
-    namespace: release_gem
+    namespace: gem
     bind:
-      qb_dir: "{{ qb_dir }}"
+      gem_root: "{{ gem_root }}"
     src: |
-      spec_pattern = "#{ qb_dir }/*.gemspec"
+      spec_pattern = "#{ gem_root }/*.gemspec"
       spec_path = Dir.glob(spec_pattern)[0]
       
       if spec_path.nil?
@@ -50,68 +68,72 @@
         'current_version' => version.version,
         'release_version' => version.release,
         'next_version' => next_version,
-        'version_path' => "#{ qb_dir }/lib/#{ name }/version.rb",
+        'version_path' => "#{ gem_root }/lib/#{ name }/version.rb",
         'spec_path' => spec_path,
       }
   
 - debug:
     msg:
     # - spec_path: >-
-    #     {{ release_gem_spec_path }}
+    #     {{ gem_spec_path }}
     # - version_path: >-
-    #     {{ release_gem_version_path }}
+    #     {{ gem_version_path }}
     - current: >-
-        {{ release_gem_current_version }}
+        {{ gem_current_version }}
     - release: >-
-        {{ release_gem_release_version }}
+        {{ gem_release_version }}
     - next: >-
-        {{ release_gem_next_version }}
+        {{ gem_next_version }}
 
-- name: "change version to release version {{ release_gem_release_version }}"
+- name: "change version to release version {{ gem_release_version }}"
   replace:
-    dest: "{{ release_gem_version_path }}"
-    regexp: "VERSION\\s*=\\s*\"{{ release_gem_current_version }}\""
-    replace: "VERSION = \"{{ release_gem_release_version }}\""
-  when: release_gem_current_version != release_gem_release_version
+    dest: "{{ gem_version_path }}"
+    regexp: "VERSION\\s*=\\s*\"{{ gem_current_version }}\""
+    replace: "VERSION = \"{{ gem_release_version }}\""
+  when: gem_current_version != gem_release_version
+
 
-- name: add release version to git
-  command: "git add {{ release_gem_version_path }}"
+- name: >-
+    Add version file {{ gem_version_path }} to Git.
+  command: "git add {{ gem_version_path }}"
   args:
-    chdir: "{{ qb_dir }}"
-  when: release_gem_current_version != release_gem_release_version
+    chdir: "{{ gem_root }}"
+  when: gem_current_version != gem_release_version
+
 
-- name: commit release version
-  command: git commit -m "bump to v{{ release_gem_release_version }}"
+- name: >-
+    Commit version file {{ gem_version_path }} in Git.
+  command: git commit -m "bump to v{{ gem_release_version }}"
   args:
-    chdir: "{{ qb_dir }}"
-  when: release_gem_current_version != release_gem_release_version
+    chdir: "{{ gem_root }}"
+  when: gem_current_version != gem_release_version
 
 - name: release with bundler
   shell: bundle exec rake release
   args:
-    chdir: "{{ qb_dir }}"
+    chdir: "{{ gem_root }}"
 
-- name: "change version to next version {{ release_gem_next_version }}"
+- name: "change version to next version {{ gem_next_version }}"
   replace:
-    dest: "{{ release_gem_version_path }}"
-    regexp: "VERSION\\s*=\\s*\"{{ release_gem_release_version }}\""
-    replace: "VERSION = \"{{ release_gem_next_version }}\""
+    dest: "{{ gem_version_path }}"
+    regexp: "VERSION\\s*=\\s*\"{{ gem_release_version }}\""
+    replace: "VERSION = \"{{ gem_next_version }}\""
 
 - name: add next dev version to git
-  command: "git add {{ release_gem_version_path }}"
+  command: "git add {{ gem_version_path }}"
   args:
-    chdir: "{{ qb_dir }}"
+    chdir: "{{ gem_root }}"
 
 - name: commit next dev version
-  command: git commit -m "start {{ release_gem_next_version }}"
+  command: git commit -m "start {{ gem_next_version }}"
   args:
-    chdir: "{{ qb_dir }}"
+    chdir: "{{ gem_root }}"
 
 - name: push next dev version
   command: git push
   args:
-    chdir: "{{ qb_dir }}"
+    chdir: "{{ gem_root }}"
 
 - debug:
     msg: >
-      v{{ release_gem_release_version }} released.
+      v{{ gem_release_version }} released.

data/roles/qb/git/check/clean/README.md

@@ -0,0 +1,4 @@
+qb/git/check/clean Role
+========================================================================
+
+Fails if `git_root` is not clean of modified and uncommitted files.