qb 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfe61f1565472727bdae6b030b59ef7bdeca300
-  data.tar.gz: 75c4ca2512edb66c32d35c4b24c16e2199fa5ca1
+  metadata.gz: 8eacfdedcfc6d42f8f29a3c4c0a5e4cf7e13fd50
+  data.tar.gz: db07c58f091593b21ce3e490d4259429f022f369
 SHA512:
-  metadata.gz: 8d20ad6373ec039f0e45cc97a8885ae6e0871fa18a559550b5ea284f2b6af2598d98bad66063c8c74ddc60e5d42ff42636d7627932d15ed6b9d76f35a90e139a
-  data.tar.gz: f74ada30a77323db4e41705a9cb57fab452b795c0da82412e9a944c0ba7a5ca430a2825f0d50008dfe2ae4ed7044b23e97d23339fbca5f6b0c8398e4f06bd323
+  metadata.gz: ee1d4880b662945fd9f81003daffb58bf565bd0d103ab535e66fd790620ac1f640f3c49ac99c5bc7248713e58c4ceb9cf92d22bf96f8e01352c8935c000c9628
+  data.tar.gz: d7e20dbb0372a085c21047db8f394a3a38b83d67bd50ddd2735a58eb050a303a1c2da80b8c9293e876ce98c63a81d72870ce07e4e2bf0685ef5e6b2ffe9247e3

data/lib/qb/version.rb

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

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

@@ -1,6 +1,6 @@
 ---
 qb.qb_role:
-  defaults: false
+  defaults: true
   files: true
   templates: false
   vars: true

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

@@ -0,0 +1,4 @@
+---
+# defaults file for qb.nrser_js
+
+nrser_js_yarn: false

data/roles/qb.nrser_js/files/gulpfile.js

@@ -1,4 +1,8 @@
 const gulp = require('gulp');
-const ugh = require('./ughfile');
+const Ugh = require('nrser/lib/ugh').Ugh;
 
-ugh.createGulpTasks(gulp);
+const ugh = new Ugh({gulp, packageDir: __dirname});
+
+ugh.autoTasks();
+
+module.exports = ugh;

data/roles/qb.nrser_js/meta/qb.yml

@@ -43,5 +43,11 @@ options:
 #   type: boolean # boolean (default) | string
 #   short: e
 
+- name: yarn
+  description: use yarn node package manager instead of npm
+  required: false
+  type: boolean
+  short: y
+
 - include: qb.npm_package
   as: package

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

@@ -38,22 +38,11 @@
     src: .babelrc
     dest: "{{ qb_dir }}/.babelrc"
 
-- name: add ughfile.js
-  copy:
-    src: ughfile.js
-    dest: "{{ qb_dir }}/ughfile.js"
-
 - name: add gulpfile.js
   copy:
     src: gulpfile.js
     dest: "{{ qb_dir }}/gulpfile.js"
 
-- name: flow init
-  command: node_modules/.bin/flow init
-  args:
-    chdir: "{{ qb_dir }}"
-    creates: "{{ qb_dir }}/.flowconfig"
-
 - name: "ignore {{ item }}"
   lineinfile:
     line: "{{ item }}"
@@ -61,3 +50,23 @@
   with_items:
   - /lib
   - /test/lib
+
+- name: npm install
+  when: "{{ nrser_js_yarn == false }}"
+  command: npm install
+  args:
+    chdir: "{{ qb_dir }}"
+    creates: "{{ qb_dir }}/node_modules"
+
+- name: yarn install
+  when: "{{ nrser_js_yarn == true}}"
+  command: yarn
+  args:
+    chdir: "{{ qb_dir }}"
+    creates: "{{ qb_dir }}/node_modules"
+
+- name: flow init
+  command: ./node_modules/.bin/flow init
+  args:
+    chdir: "{{ qb_dir }}"
+    creates: "{{ qb_dir }}/.flowconfig"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -480,10 +480,10 @@ files:
 - roles/qb.npm_package/meta/qb.yml
 - roles/qb.npm_package/tasks/main.yml
 - roles/qb.nrser_js/.qb-options.yml
+- roles/qb.nrser_js/defaults/main.yml
 - roles/qb.nrser_js/files/.babelrc
 - roles/qb.nrser_js/files/.gitkeep
 - roles/qb.nrser_js/files/gulpfile.js
-- roles/qb.nrser_js/files/ughfile.js
 - roles/qb.nrser_js/meta/main.yml
 - roles/qb.nrser_js/meta/qb.yml
 - roles/qb.nrser_js/tasks/main.yml

data/roles/qb.nrser_js/files/ughfile.js

@@ -1,7 +0,0 @@
-const Ugh = require('nrser/lib/ugh').Ugh;
-
-const ugh = new Ugh({packageDir: __dirname});
-
-ugh.autoTasks();
-
-module.exports = ugh;