qb 0.1.45 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb1a17b0a0de1df2f3c2204495d65961bccf3c9
-  data.tar.gz: cb96ea3f64119b67ca44ba31e301cecee3b70582
+  metadata.gz: ff68700805b2dbcd27abea8754ef0c5ea66e2151
+  data.tar.gz: 5ca65baf700375df21a47b3b225fc6cf396bcff6
 SHA512:
-  metadata.gz: e166103c65024a4617fbc718881bddbd42670f5982f1ba660c740cf55d9e9bbf809d7d25f1adfdcad8bc82228be39e7065c4b83ad5f6a11f13ea1a56fd66f419
-  data.tar.gz: f614153b02e88e36ba18bf41e5a6a4a672004fc50cc13e970466e9c779d57da10d172e1a0930f4b7ee6caaaadc3493dcd03f3a5abfea35a77a1dffdaae4de1a2
+  metadata.gz: cbe87af1aa353cc72495d365b90d0491a92dee4d3b9f7dfa69ca398f3efb2dcfe3a7ac475ef73f3aedc966af8af9d6bb8e6ea82215d59c9a6de78ff574f48ea0
+  data.tar.gz: cb7da6e5098071a6c59371e254e04338d516f4cf507e65ea01935885f1d0fab7ba6e9dc5ce8fe9495e8d9269143c2a091a93c62d1680c0f31a88e823693f68a1

data/lib/qb/role.rb

@@ -138,17 +138,43 @@ module QB
     
     # get an array of QB::Role that match an input string
     def self.matches input
+      # keep this here to we don't re-gen every loop
       available = self.available
       
+      # first off, see if input matches any relative paths exactly
       available.each {|role|
-        # exact match to relative path
         return [role] if role.rel_path.to_s == input
-      }.each {|role|
-        # exact match to full name
-        return [role] if role.name == input
-      }.each {|role|
-        # exact match without the namespace prefix ('qb.' or similar)
-        return [role] if role.namespaceless == input
+      }
+      
+      # create an array of "separator" variations to try *exact* matching 
+      # against. in order of preference:
+      # 
+      # 1.  exact input
+      #     -   this means if you ended up with roles that actually *are*
+      #         differnetiated by '_/-' differences (which, IMHO, is a 
+      #         horrible fucking idea), you can get exactly what you ask for
+      #         as a first priority
+      # 2.  input with '-' changed to '_'
+      #     -   prioritized because convetion is to underscore-separate
+      #         role names.
+      # 3.  input with '_' changed to '-'
+      #     -   really just for convience's sake so you don't really have to 
+      #         remember what separator is used.
+      #     
+      separator_variations = [
+        input,
+        input.gsub('-', '_'),
+        input.gsub('_', '_'),
+      ]
+      
+      separator_variations.each {|variation|
+        available.each {|role|
+          # exact match to full name
+          return [role] if role.name == variation
+        }.each {|role|
+          # exact match without the namespace prefix ('qb.' or similar)
+          return [role] if role.namespaceless == variation
+        }  
       }
       
       # see if we prefix match any full names

data/lib/qb/version.rb

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

data/library/qb_facts.py

@@ -18,6 +18,9 @@ def gemspec_path(dir):
 
 
 def is_gem(dir):
+    if dir is None:
+        return False
+        
     return dir and bool(gemspec_path(dir))
 
 
@@ -26,6 +29,9 @@ def package_json_path(dir):
 
 
 def has_package_json(dir):
+    if dir is None:
+        return False
+    
     return os.path.isfile(package_json_path(dir))
 
 

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

@@ -1,2 +1,3 @@
 ---
 # defaults file for qb.git_repo
+git_repo_dest: "{{ qb_dir }}"

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

@@ -4,4 +4,5 @@
 dependencies:
 - role: qb.gitignore
   gitignore_name: Global/OSX
+  gitignore_dest: "{{ git_repo_dest }}"
   when: ansible_distribution == "MacOSX"

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

@@ -4,6 +4,6 @@
 - name: initialize git
   command: git init
   args:
-    chdir: "{{ dir }}"
-    creates: "{{ dir }}/.git"
+    chdir: "{{ git_repo_dest }}"
+    creates: "{{ git_repo_dest }}/.git"
   

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

@@ -1,4 +1,5 @@
 ---
 # defaults file for qb.gitignore
 
+gitignore_dest: "{{ qb_dir }}"
 gitignore_force: false

data/roles/qb.gitignore/files/gitignore/Global/OSX.gitignore

@@ -0,0 +1 @@
+macOS.gitignore

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

@@ -1,16 +1,21 @@
 ---
 # tasks file for qb.gitignore
 
+- name: create directory
+  file:
+    path: "{{ gitignore_dest }}"
+    state: directory
+
 - name: create .gitignore
   copy:
     content: ''
-    dest: "{{ qb_dir }}/.gitignore"
+    dest: "{{ gitignore_dest }}/.gitignore"
     force: "{{ gitignore_force }}"
 
 - name: modify .gitignore
   blockinfile:
     content: "{{ lookup('file', 'gitignore/' + gitignore_name + '.gitignore') }}"
-    dest: "{{ qb_dir }}/.gitignore"
+    dest: "{{ gitignore_dest }}/.gitignore"
     beginmarker: |
       {{ '#' * 78 }}
       # BEGIN {{ gitignore_name }}.gitignore

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

@@ -2,8 +2,23 @@
 # defaults file for qb.install
 
 install_path: "{{ qb_user_roles_dir }}"
-install_src: "{{ install_name.split('.')[0] }}/ansible-{{ install_name }}"
+
+install_src: "{% if install_create -%}
+  {{ ansible_env.GITHUB_HOME }}/{{ install_name.split('.')[0] }}/ansible-{{ install_name }}
+{%- else -%}
+  {{ install_name.split('.')[0] }}/ansible-{{ install_name }}
+{%- endif %}"
+
 install_version: master
+
 install_force: false
+
 install_update: false
-install_link: false
+
+install_link: "{% if install_create -%}
+  true
+{%- else -%}
+  false
+{%- endif %}"
+
+install_create: false

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

@@ -3,6 +3,12 @@
 
 allow_duplicates: yes
 
-dependencies: []
+dependencies: # []
 # - role: role-name
-
+- role: qb.qb_role
+  when: "{{ install_create }}"
+  role_dest: "{{ install_src }}"
+  role_role_name: "{{ install_name }}"
+  role_project: true
+  project_hub: true
+  project_dest: "{{ install_src }}"

data/roles/qb.install/meta/qb.yml

@@ -86,3 +86,9 @@ options:
   required: false
   type: boolean
   short: l
+
+- name: create
+  description: create a repo for a new role to install in $GITHUB_HOME.
+  required: false
+  type: boolean
+  short: c

data/roles/qb.install/tasks/create.yml

@@ -0,0 +1,4 @@
+---
+- name: open new qb role repo in atom
+  shell: "atom {{ install_src }}"
+  

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

@@ -6,4 +6,6 @@
 
 - include: link.yml
   when: install_link
-  
+
+- include: create.yml
+  when: install_create

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

@@ -1,7 +1,8 @@
 ---
 # defaults file for qb.project
+project_dest: "{{ qb_dir }}"
 project_owner: "{{ ansible_env.GITHUB_USER }}"
-project_name: "{{ qb_dir | realpath | basename }}"
+project_name: "{{ project_dest | realpath | basename }}"
 project_bin: true
 project_dev: true
 project_dev_bin: true

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

@@ -2,4 +2,5 @@
 # meta file for qb.project
 
 dependencies:
-- role: qb.git_repo
+- role: qb.git_repo
+  git_repo_dest: "{{ project_dest }}"

data/roles/qb.project/meta/qb.yml

@@ -3,6 +3,10 @@ default_dir:
   exe: qb/get_dir
   
 vars:
+- name: dest
+  description: destination directory.
+  type: string
+  
 - name: owner
   desciption: github owner of directory
   type: string

data/roles/qb.project/tasks/dev.yml

@@ -1,7 +1,7 @@
 ---
 
 - set_fact:
-    project_dev_dir: "{{ qb_dir }}/dev"
+    project_dev_dir: "{{ project_dest }}/dev"
 
 - set_fact:
     project_dev_gitignore: "{{ project_dev_dir }}/.gitignore"

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

@@ -6,7 +6,7 @@
 
 - name: create /bin directory
   git_mkdir:
-    path: "{{ qb_dir }}/bin"
+    path: "{{ project_dest }}/bin"
   when: project_bin
 
 # dev
@@ -20,7 +20,7 @@
 
 - name: create tmp directory
   git_mkdir:
-    path: "{{ qb_dir }}/tmp"
+    path: "{{ project_dest }}/tmp"
     # have to explicitly commit it since it's ignored 
     commit: true
   when: project_tmp
@@ -28,7 +28,7 @@
 - name: ignore tmp dir in git
   lineinfile:
     line: /tmp
-    dest: "{{ qb_dir }}/.gitignore"
+    dest: "{{ project_dest }}/.gitignore"
   when: project_tmp
 
 # readme
@@ -37,7 +37,7 @@
 - name: create readme
   template:
     src: README.md.j2
-    dest: "{{ qb_dir }}/README.md"
+    dest: "{{ project_dest }}/README.md"
     force: "{{ project_force }}"
   when: project_readme
 
@@ -47,7 +47,7 @@
 - name: run `hub create`
   command: "hub create{% if project_private %} -p{% endif %} {{ project_owner }}/{{ project_name }}"
   args:
-    chdir: "{{ qb_dir }}"
+    chdir: "{{ project_dest }}"
   when: project_hub
 
 # qb artifacts
@@ -56,5 +56,5 @@
 - name: ignore .qb-playbook.yml
   lineinfile:
     line: .qb-playbook.yml
-    dest: "{{ qb_dir }}/.gitignore"
+    dest: "{{ project_dest }}/.gitignore"
   when: project_tmp

data/roles/qb.qb_role/.qb-options.yml

@@ -2,3 +2,4 @@
 qb.qb_role:
   defaults: true
   templates: true
+  vars: true

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

@@ -1,4 +1,8 @@
 ---
 # defaults file for qb.qb_role
-qb_role_dest: "{{ qb_dir }}"
+
+# default the encapsulated qb.role's `role-dest` to `qb_dir` so we can be
+# sure to be able to use it here... not sure if needed.
+role_dest: "{{ qb_dir }}"
+
 qb_role_modules: []

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

@@ -3,13 +3,13 @@
 
 - name: create meta directory
   file:
-    path: "{{ dir }}/meta"
+    path: "{{ role_dest }}/meta"
     state: directory
 
 - name: create meta/qb.yml
   template:
     src: qb.yml.j2
-    dest: "{{ dir }}/meta/qb.yml"
+    dest: "{{ role_dest }}/meta/qb.yml"
     force: false
 
 - include: module.yml

data/roles/qb.qb_role/tasks/module.yml

@@ -1,7 +1,7 @@
 ---
 - set_fact:
     qb_role_module_class: "{{ qb_role_module | class_case }}"
-    qb_role_module_path: "{{ qb_role_dest }}/library/{{ qb_role_module }}"
+    qb_role_module_path: "{{ role_dest }}/library/{{ qb_role_module }}"
   
 - name: "create {{ qb_role_module }} module"
   template:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.1.46
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -385,6 +385,7 @@ files:
 - roles/qb.gitignore/files/gitignore/Global/NetBeans.gitignore
 - roles/qb.gitignore/files/gitignore/Global/Ninja.gitignore
 - roles/qb.gitignore/files/gitignore/Global/NotepadPP.gitignore
+- roles/qb.gitignore/files/gitignore/Global/OSX.gitignore
 - roles/qb.gitignore/files/gitignore/Global/Otto.gitignore
 - roles/qb.gitignore/files/gitignore/Global/README.md
 - roles/qb.gitignore/files/gitignore/Global/Redcar.gitignore
@@ -502,6 +503,7 @@ files:
 - roles/qb.install/defaults/main.yml
 - roles/qb.install/meta/main.yml
 - roles/qb.install/meta/qb.yml
+- roles/qb.install/tasks/create.yml
 - roles/qb.install/tasks/git.yml
 - roles/qb.install/tasks/link.yml
 - roles/qb.install/tasks/main.yml