qb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57852f4efcbb469892e70fad120b767400ea846
-  data.tar.gz: 5fd7da81207898ab468edc10d548d0a419707e6f
+  metadata.gz: f31d035d37daaec64eee867197075bf51e2d8c02
+  data.tar.gz: c59ffaac71ca22f403d038fa0d75c9077edfc799
 SHA512:
-  metadata.gz: 19c8ed070b42d59e5889eaa06545c467f5c822100c16addf044b3c2355c6700e28a6451db7a59e44051e3fb7553eb3c2e65a366260ed341fcf6810f98ede6063
-  data.tar.gz: 45ae2b7a8d226c9e4aa521934c8b257e2489c2ef5b08a3736174f59064a095d1c3e1663dd36a963f5c758a0f1c0e41aeca338b631631062469ec3ced44c591d5
+  metadata.gz: 803936e367ab858f49cbabc29772e8a44627bc881ce115cb1c178036e6f5ff47f435049e31e7a48db3d4d6e2fff7666221ca4b45608f3fe9204c128c90afd930
+  data.tar.gz: bbbfc4fb4bb756e6658cb86bde22c7f8149709444c06db5c2abdc8a7599285c2bc0bcfbd06ec403c2e3c4493f33dd0aa4a84180b4dbd503fa3ff5d31c6964faa

data/.gitignore

@@ -2,7 +2,7 @@
 /.qb-playbook.yml
 
 /dev/repos
-/dev/ref/repos
+/dev/ref/tmp
 /tmp
 
 ##############################################################################
@@ -12,9 +12,8 @@
 .AppleDouble
 .LSOverride
 
-# Icon must end with two 
-Icon
-
+# Icon must end with two 
+Icon
 
 # Thumbnails
 ._*
@@ -56,6 +55,17 @@ Temporary Items
 .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/
@@ -64,7 +74,7 @@ build/
 /rdoc/
 
 ## Environment normalization:
-/.bundle/
+.bundle/
 /vendor/bundle
 /lib/bundler/man/
 

data/bin/qb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+# stub instead of `bundle exec qb ...`
+require 'bundler/setup'
+load 'exe/qb'

data/dev/ansible.cfg

@@ -0,0 +1,4 @@
+[defaults]
+
+roles_path = ../tmp/roles:./roles
+inventory = ./hosts

data/dev/hosts

@@ -0,0 +1,2 @@
+# connection to the local machine for dev/setup.yml
+localhost ansible_connection=local

data/dev/requirements.yml

@@ -0,0 +1,12 @@
+- name: nrser.nodenv
+  src: https://github.com/nrser/ansible-nrser.nodenv.git
+  version: v0.1.0
+- name: nrser.rbenv_gem
+  src: https://github.com/nrser/ansible-nrser.rbenv_gem.git
+  version: v0.1.1
+- name: nrser.rbenv
+  src: https://github.com/nrser/ansible-nrser.rbenv.git
+  version: v0.1.0
+- name: nrser.dev_setup
+  src: https://github.com/nrser/ansible-nrser.dev_setup.git
+  version: v0.1.1

data/dev/setup.yml

@@ -4,55 +4,38 @@
 
   hosts: localhost
 
-  vars:
+  pre_tasks:
+  - name: load dev_setup facts
+    dev_setup_facts:
+
+  roles:
+  - role: nrser.dev_setup
     # repos that are co-developed
-    repos:
+    dev_setup_repos:
     - owner: nrser
       name: gitignore
-
-    # repos that are used for reference only
-    ref_repos:
-    - owner: ansible
-      name: ansible
-      version: v1.9.4-1
-      dir_name: ansible-v1.9.4
-      depth: 1
-    
+      
     - owner: nrser
-      name: nrser.env
-    
-    - owner: beiarea
-      name: workstations
-    
-    - owner: nrser
-      name: ansible-nrser.profile
+      name: ansible-nrser.dev_setup
 
-  tasks:
-  - name: clone co-dev repos
-    git:
-      repo: git@github.com:{{ item.owner }}/{{ item.name }}.git
-      dest: ./repos/{{ item.dir_name | default(item.name) }}
-      version: "{{ item.version | default('HEAD') }}"
-      update: no
-    with_items: repos
+    # sources that are used for reference only
+    dev_setup_refs:
+      github:
+      - owner: ansible
+        name: ansible
+        version: v1.9.4-1
+        dir_name: ansible-v1.9.4
+        depth: 1
+      
+      - owner: nrser
+        name: nrser.env
+      
+      - owner: beiarea
+        name: workstations
+      
+      - owner: nrser
+        name: ansible-nrser.profile
+      
+      archive: []
 
-  - name: see if the repos have a Gemfile
-    stat:
-      path: "./repos/{{ item.dir_name | default(item.name) }}/Gemfile"
-    with_items: repos
-    register: gemfile_stats
-
-  - name: install bunlde for any that have a Gemfile
-    shell: bash -lc "bundle install --path=./.bundle"
-    args:
-      chdir: "{{ item.invocation.module_complex_args.path | dirname }}"
-    when: item.stat.exists
-    with_items: gemfile_stats.results | default([])
-
-  - name: clone ref repos
-    git:
-      repo: git@github.com:{{ item.owner }}/{{ item.name }}.git
-      dest: ./ref/repos/{{ item.dir_name | default(item.name) }}
-      version: "{{ item.version | default('HEAD') }}"
-      depth: "{{ item.depth | default(0) }}"
-    with_items: ref_repos
+  tasks:

data/lib/qb/version.rb

@@ -1,3 +1,3 @@
 module QB
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/library/git_mkdir.py

@@ -55,7 +55,7 @@ def main():
     if (not os.path.exists(keep_path)) and (not contians_files(path)):
         open(os.path.join(path, '.gitkeep'), 'a').close()
         with cd(path):
-            subprocess.check_call(['git', 'add', '.gitkeep'])
+            subprocess.check_call(['git', 'add', '-f', '.gitkeep'])
         changed = True
 
     module.exit_json(

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

@@ -0,0 +1,3 @@
+---
+qb.role:
+  vars: true

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

@@ -1,6 +1,8 @@
 ---
 # meta file for qb.gitignore
 
+allow_duplicates: yes
+
 dependencies:
 - role: qb.git_repo
 

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

@@ -1,25 +1,26 @@
 ---
 # tasks file for qb.gitignore
 
+- set_fact:
+    gitignore_repo: ./tmp/gitignore-{{ gitignore_version }}
+
 - name: check out nrser/gitignore
   git:
     repo: git@github.com:nrser/gitignore.git
-    dest: ./tmp/gitignore
-    version: master
+    dest: "{{ gitignore_repo}}"
+    version: v{{ gitignore_version }}
     depth: 1
-    update: "{{ gitignore_update }}"
+    update: false
 
 - name: create .gitignore
   copy:
     content: ''
     dest: "{{ dir }}/.gitignore"
     force: false
-  register: gitignore_created
 
-- name: add the gitignore
+- name: modify .gitignore
   blockinfile:
-    # content: "{{ ('#' * 78) + '\n' + lookup('file', './tmp/gitignore/' + gitignore_name + '.gitignore') + '\n' + ('#' * 78) }}"
-    content: "{{ lookup('file', './tmp/gitignore/' + gitignore_name + '.gitignore') }}"
+    content: "{{ lookup('file', gitignore_repo + '/' + gitignore_name + '.gitignore') }}"
     dest: "{{ dir }}/.gitignore"
     beginmarker: |
       {{ '#' * 78 }}
@@ -29,12 +30,3 @@
       #
       # END {{ gitignore_name }}.gitignore
       {{ '#' * 78 }}
-      
-  register: gitignore_added
-
-- command: git add -f .gitignore
-  args:
-    chdir: "{{ dir }}"
-  when: >
-    gitignore_created.changed or
-    gitignore_added.changed

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

@@ -0,0 +1,3 @@
+---
+# vars file for qb.gitignore
+gitignore_version: 0.1.0

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

@@ -1,3 +1,4 @@
 ---
 qb.role:
   templates: true
+  files: true

data/roles/qb.project/files/ansible.cfg

@@ -0,0 +1,4 @@
+[defaults]
+
+roles_path = ../tmp/roles:./roles
+inventory = ./hosts

data/roles/qb.project/files/hosts

@@ -0,0 +1,2 @@
+# connection to the local machine for dev/setup.yml
+localhost ansible_connection=local

data/roles/qb.project/files/requirements.yml

@@ -0,0 +1,12 @@
+- name: nrser.nodenv
+  src: https://github.com/nrser/ansible-nrser.nodenv.git
+  version: v0.1.0
+- name: nrser.rbenv_gem
+  src: https://github.com/nrser/ansible-nrser.rbenv_gem.git
+  version: v0.1.1
+- name: nrser.rbenv
+  src: https://github.com/nrser/ansible-nrser.rbenv.git
+  version: v0.1.0
+- name: nrser.dev_setup
+  src: https://github.com/nrser/ansible-nrser.dev_setup.git
+  version: v0.1.1

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

@@ -20,30 +20,8 @@
 # setup
 # =====
 
-- name: create /dev/setup.yml
-  template:
-    src: setup.yml.j2
-    dest: "{{ dir }}/dev/setup.yml"
-    force: false
+- include: setup.yml
   when: project_setup
-  register: setup_yml
-
-- command: git add dev/setup.yml
-  args:
-    chdir: "{{ dir }}"
-  when: setup_yml.changed
-
-- name: ignore /dev/repos in git
-  lineinfile:
-    line: /dev/repos
-    dest: "{{ dir }}/.gitignore"
-  register: ignore_dev_repos
-
-- name: ignore /dev/ref/repos in git
-  lineinfile:
-    line: /dev/ref/repos
-    dest: "{{ dir }}/.gitignore"
-  register: ignore_dev_ref_repos
 
 # scratch
 # =======
@@ -89,14 +67,3 @@
   args:
     chdir: "{{ dir }}"
   when: project_hub
-
-# postamble
-# =========
-
-- command: git add .gitignore
-  args:
-    chdir: "{{ dir }}"
-  when: >
-    ignore_dev_repos.changed or
-    ignore_dev_ref_repos.changed or
-    ignore_tmp.changed

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

@@ -0,0 +1,36 @@
+# setup
+# =====
+
+- name: create dev/setup.yml
+  template:
+    src: setup.yml.j2
+    dest: "{{ dir }}/dev/setup.yml"
+    force: false
+
+- name: create dev/ansible.cfg
+  copy:
+    src: ansible.cfg
+    dest: "{{ dir }}/dev/ansible.cfg"
+    force: false
+
+- name: create dev/hosts
+  copy:
+    src: hosts
+    dest: "{{ dir }}/dev/hosts"
+    force: false
+
+- name: create dev/requirements.yml
+  copy:
+    src: requirements.yml
+    dest: "{{ dir }}/dev/requirements.yml"
+    force: false
+
+- name: ignore dev/repos in git
+  lineinfile:
+    line: /dev/repos
+    dest: "{{ dir }}/.gitignore"
+
+- name: ignore dev/ref/repos in git
+  lineinfile:
+    line: /dev/ref/repos
+    dest: "{{ dir }}/.gitignore"

data/roles/qb.project/templates/setup.yml.j2

@@ -4,49 +4,34 @@
 {% raw %}
   hosts: localhost
 
-  vars:
+  pre_tasks:
+  - name: load dev_setup facts
+    dev_setup_facts:
+
+  roles:
+  - role: nrser.dev_setup
     # repos that are co-developed
-    repos: []
+    dev_setup_repos: []
     # example:
     # - owner: nrser
     #   name: qb
 
-    # repos that are used for reference only
-    ref_repos: []
-    # example:
-    # - owner: ansible
-      # name: ansible
-      # version: v1.9.4-1
-      # dir_name: ansible-v1.9.4
-      # depth: 1
+    # sources that are used for reference only
+    dev_setup_refs:
+      github: []
+      # example:
+      # - owner: ansible
+        # name: ansible
+        # version: v1.9.4-1
+        # dir_name: ansible-v1.9.4
+        # depth: 1
+      
+      archive: []
+      # example:
+      # - url: https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.23.zip
+      #   file_name: google_appengine_1.9.23.zip
+      #   dir_name: google_appengine_python_sdk_1.9.23
 
   tasks:
-  - name: clone co-dev repos
-    git:
-      repo: git@github.com:{{ item.owner }}/{{ item.name }}.git
-      dest: ./repos/{{ item.dir_name | default(item.name) }}
-      version: "{{ item.version | default('HEAD') }}"
-      update: no
-    with_items: repos
-
-  - name: see if the repos have a Gemfile
-    stat:
-      path: "./repos/{{ item.dir_name | default(item.name) }}/Gemfile"
-    with_items: repos
-    register: gemfile_stats
-
-  - name: install bunlde for any that have a Gemfile
-    shell: bash -lc "bundle install --path=./.bundle"
-    args:
-      chdir: "{{ item.invocation.module_complex_args.path | dirname }}"
-    when: item.stat.exists
-    with_items: gemfile_stats.results | default([])
-
-  - name: clone ref repos
-    git:
-      repo: git@github.com:{{ item.owner }}/{{ item.name }}.git
-      dest: ./ref/repos/{{ item.dir_name | default(item.name) }}
-      version: "{{ item.version | default('HEAD') }}"
-      depth: "{{ item.depth | default(0) }}"
-    with_items: ref_repos
+  
 {% endraw %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,9 +84,12 @@ files:
 - Rakefile
 - ansible.cfg
 - bin/console
+- bin/qb
 - bin/setup
-- dev/bin/.gitkeep
-- dev/bin/ungem
+- bin/ungem
+- dev/ansible.cfg
+- dev/hosts
+- dev/requirements.yml
 - dev/setup.yml
 - exe/qb
 - lib/qb.rb
@@ -119,14 +122,20 @@ files:
 - roles/qb.git_repo/defaults/main.yml
 - roles/qb.git_repo/meta/main.yml
 - roles/qb.git_repo/tasks/main.yml
+- roles/qb.gitignore/.qb-options.yml
 - roles/qb.gitignore/defaults/main.yml
 - roles/qb.gitignore/meta/main.yml
 - roles/qb.gitignore/tasks/main.yml
+- roles/qb.gitignore/vars/main.yml
 - roles/qb.project/.qb-options.yml
 - roles/qb.project/defaults/main.yml
+- roles/qb.project/files/ansible.cfg
+- roles/qb.project/files/hosts
+- roles/qb.project/files/requirements.yml
 - roles/qb.project/meta/main.yml
 - roles/qb.project/qb/get_dir
 - roles/qb.project/tasks/main.yml
+- roles/qb.project/tasks/setup.yml
 - roles/qb.project/templates/.gitkeep
 - roles/qb.project/templates/README.md.j2
 - roles/qb.project/templates/setup.yml.j2
@@ -163,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: qb is all about projects. named after everyone's favorite projects.