ciderizer 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55978e38ab18ab1adea7ad6e9b8ffae746d448db
-  data.tar.gz: aad9c3d7c4ec4033f4864fd64ef1c4da1a79619f
+  metadata.gz: bc2da58bfab4d80f7d057fb226aa0c9845a90d23
+  data.tar.gz: 5cc8886bdca7a12508bbdac809d7f81cff2af10d
 SHA512:
-  metadata.gz: f75eb9c029c139e83679744c2610b8f21562cff144f50454f3dc1c247380b5d514c4803913f6ac2cfe5c76381276c6aebc49d56c1502b30c6533d16c44c8ca83
-  data.tar.gz: e13a401c25e8ef3dc4fa4aeac0c3bfb48559e86fcd545270332fa3f571c8219c8e79c630bfb2599ba240fddb4e40f01f32b1f393ab75522ca4c5a70996d9563a
+  metadata.gz: 30105a61d2d38c5938c95b4ce507888cc834f0afd6c4502aaa7af82da41ff09c861527b928a826ac98280634bf5859c665946bf6ca168d7091b36bc54b8edc21
+  data.tar.gz: 33d543a1e0d78d19197d8a56ccbc8d0d3800e85a78cc9b40f79f7833ae92d357b18dae8e5b73c203265b8cacdc497585c4ab51c2c04df90abe86b90a91d65d91

data/Readme.md

@@ -25,13 +25,17 @@ Invokes all other generators
   rails generate ciderizer
 ```
 
-#### options
-  - `rspec` - include `rspec` generator.  
+  - `rspec` - include `rspec` generator.
     Defaults to `true`
-  - `rubocop` - include `rubocop` generator  
+  - `rubocop` - include `rubocop` generator
     Defaults to `true`
+  - `gemserver HOST` sets the gemserver used for bundling.
+    Defaults to `https://rubygems.org`
+  - `konacha` - include `konacha` generator
+    Defaults to `false`
   - options from [rspec generator](#rspec) (prefixed with `rspec-`)
   - options from [rubocop generator](#rubocop) (prefixed with `rubocop-`)
+  - options from [konacha generator](#konacha) (prefixed with `konacha-`)
 
 ### rspec
 
@@ -43,9 +47,9 @@ Generates config for running rspec tests
 ```
 
 #### options
-  - `--bower` runs `bower-install` after bundling.  
+  - `--bower` runs `bower-install` after bundling.
     Defaults to `false`
-  - `--postgres` creates configuration for postgres database. Databases are deleted after the trial.  
+  - `--postgres` creates configuration for postgres database. Databases are deleted after the trial.
     Defaults to `false`
 
 ### rubocop
@@ -58,5 +62,21 @@ Generates config for running rubocop checks
 ```
 
 #### options
-  - `--github-comment` post comments about violations to GitHub.  
+  - `--github-comment` post comments about violations to GitHub.
     Defaults to `true`
+
+### konacha
+
+Generates config for running konacha Javascript specs
+
+#### Usage
+```
+  rails generate ciderizer:konacha
+```
+
+#### options
+  - `--bower` runs `bower-install` after bundling.
+    Defaults to `false`
+  - `--postgres` creates configuration for postgres database. Databases are deleted after the trial.
+    Defaults to `false`
+

data/lib/ciderizer/version.rb

@@ -1,3 +1,3 @@
 module Ciderizer
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/generators/ciderizer/base_rails_generator.rb

@@ -1,7 +1,11 @@
+require_relative 'options/bundle.rb'
+
 module Ciderizer
   class BaseRailsGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    include Options::Bundle
+
     desc <<DESC
 Description:
   Basic scripts for rails based projects
@@ -10,7 +14,8 @@ DESC
     hide!
 
     def rails_scripts
-      copy_file 'cider-ci/scripts/bundle.yml'
+      copy_file 'cider-ci/scripts/cleanup-rbenv.yml'
+      template 'cider-ci/scripts/bundle.yml'
       copy_file 'cider-ci/scripts/tmp-cache.yml'
       copy_file 'cider-ci/scripts/ruby-version.yml'
     end

data/lib/generators/ciderizer/ciderizer_generator.rb

@@ -1,5 +1,7 @@
 require_relative 'options/rspec.rb'
 require_relative 'options/rubocop.rb'
+require_relative 'options/bundle.rb'
+require_relative 'options/konacha.rb'
 
 module Ciderizer
   class CiderizerGenerator < Rails::Generators::Base
@@ -7,13 +9,17 @@ module Ciderizer
 
     include Options::Rspec
     include Options::Rubocop
+    include Options::Bundle
+    include Options::Konacha
 
     class_option :rspec, type: :boolean, default: true, desc: 'Include rspec job'
     class_option :rubocop, type: :boolean, default: true, desc: 'Include rubocop job'
+    class_option :konacha, type: :boolean, default: false, desc: 'Include konacha job'
 
     def ciderize
-      invoke('ciderizer:rspec', [], rspec_options) if options.rspec?
-      invoke('ciderizer:rubocop', [], rubocop_options) if options.rubocop?
+      invoke('ciderizer:rspec', [], rspec_options.merge(bundle_gemserver: options.bundle_gemserver)) if options.rspec?
+      invoke('ciderizer:rubocop', [], rubocop_options.merge(bundle_gemserver: options.bundle_gemserver)) if options.rubocop?
+      invoke('ciderizer:konacha', [], konacha_options) if options.konacha?
     end
   end
 end

data/lib/generators/ciderizer/konacha_generator.rb

@@ -0,0 +1,31 @@
+require_relative 'options/konacha.rb'
+
+module Ciderizer
+  class KonachaGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    include Options::Konacha
+
+    desc <<DESC
+Description:
+  Generates configuration for a konacha job
+DESC
+
+    def cider_ci_directory
+      invoke 'ciderizer:base_rails'
+
+      copy_file 'cider-ci/scripts/bower.yml' if options.bower?
+      template 'cider-ci/scripts/postgres.yml' if options.postgres?
+
+      template 'cider-ci/jobs/konacha.yml'
+    end
+
+    def master_file
+      copy_file 'cider-ci.yml', 'cider-ci.yml' unless File.exist?('cider-ci.yml')
+      # to avoid double inclusion
+      gsub_file 'cider-ci.yml', "    - cider-ci/jobs/konacha.yml\n", ''
+      inject_into_file 'cider-ci.yml', after: "_cider-ci_include:\n" do
+        "    - cider-ci/jobs/konacha.yml\n"
+      end
+    end
+  end
+end

data/lib/generators/ciderizer/options/bundle.rb

@@ -0,0 +1,22 @@
+module Ciderizer
+  module Options
+    module Bundle
+      def self.included(base)
+        base.class_option option_name(:gemserver, base), type: :string, default: 'https://rubygems.org', desc: 'Configures gemserver used for bundling'
+      end
+
+      def self.option_name(name, base)
+        base.name.demodulize =~ /^base_rails/i ? name : "bundle_#{name}"
+      end
+      private_class_method :option_name
+
+      private
+
+      def bundle_options
+        {
+          gemserver: options[:gemserver] || options[:bundle_gemserver]
+        }
+      end
+    end
+  end
+end

data/lib/generators/ciderizer/options/konacha.rb

@@ -0,0 +1,24 @@
+module Ciderizer
+  module Options
+    module Konacha
+      def self.included(base)
+        base.class_option option_name(:bower, base), type: :boolean, default: false, desc: 'Include `bower install`'
+        base.class_option option_name(:postgres, base), type: :boolean, default: false, desc: 'Include postgres setup'
+      end
+
+      def self.option_name(name, base)
+        base.name.demodulize =~ /^konacha/i ? name : "konacha_#{name}"
+      end
+      private_class_method :option_name
+
+      private
+
+      def konacha_options
+        {
+          bower: options[:bower] || options[:konacha_bower],
+          postgres: options[:postgres] || options[:konacha_postgres]
+        }
+      end
+    end
+  end
+end

data/lib/generators/ciderizer/rspec_generator.rb

@@ -1,9 +1,11 @@
 require_relative 'options/rspec.rb'
+require_relative 'options/bundle.rb'
 
 module Ciderizer
   class RspecGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
     include Options::Rspec
+    include Options::Bundle
 
     desc <<DESC
 Description:
@@ -11,7 +13,7 @@ Description:
 DESC
 
     def cider_ci_directory
-      invoke 'ciderizer:base_rails'
+      invoke('ciderizer:base_rails', [], bundle_options)
 
       copy_file 'cider-ci/scripts/rspec.yml'
 

data/lib/generators/ciderizer/rubocop_generator.rb

@@ -1,9 +1,11 @@
 require_relative 'options/rubocop.rb'
+require_relative 'options/bundle.rb'
 
 module Ciderizer
   class RubocopGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
     include Options::Rubocop
+    include Options::Bundle
 
     desc <<DESC
 Description:
@@ -11,7 +13,7 @@ Description:
 DESC
 
     def cider_ci_directory
-      invoke 'ciderizer:base_rails'
+      invoke('ciderizer:base_rails', [], bundle_options)
 
       copy_file 'cider-ci/scripts/rubocop.yml'
 

data/lib/generators/ciderizer/templates/cider-ci/jobs/konacha.yml

@@ -0,0 +1,54 @@
+konacha:
+  name: 'Konacha tests'
+
+  run-on:
+    - type: branch
+      include-match: ^.*$
+
+  context:
+
+    task-defaults:
+      ports:
+        PHANTOMJS_PORT:
+          inet_address: "localhost"
+          min: 44600
+          max: 44999
+      scripts:
+        _cider-ci_include:
+          - cider-ci/scripts/cleanup-rbenv.yml
+          - cider-ci/scripts/bundle.yml
+          - cider-ci/scripts/tmp-cache.yml
+          - cider-ci/scripts/ruby-version.yml
+          - cider-ci/scripts/secrets.yml
+          <% if options.bower? %>
+          - cider-ci/scripts/bower.yml
+          <% end %>
+          <% if options.postgres? %>
+          - cider-ci/scripts/postgres.yml
+          <% end %>
+
+      trial-attachments:
+        logs:
+          include-match: log\/.*\.log$
+          content-type: text/plain
+
+    tasks:
+
+      konacha:
+        name: All Konacha tests
+        scripts:
+          konacha:
+            body: |
+              #!/usr/bin/env bash
+              RAILS_ENV=test bundle exec rake konacha:run
+            start-when:
+            - script: bundle
+            <% if options.bower? %>
+            - script: bower-install
+            <% end %>
+            - script: ruby-version
+            - script: tmp-cache
+            <% if options.postgres? %>
+            - script: prepare-database
+            <% end %>
+            - script: copy-secrets

data/lib/generators/ciderizer/templates/cider-ci/jobs/rspec.yml

@@ -1,5 +1,5 @@
 rspec:
-  name: 'RSPec tests'
+  name: 'RSpec tests'
 
   run-on:
     - type: branch
@@ -31,6 +31,7 @@ rspec:
             <% end %>
 
         _cider-ci_include:
+          - cider-ci/scripts/cleanup-rbenv.yml
           - cider-ci/scripts/bundle.yml
           - cider-ci/scripts/tmp-cache.yml
           - cider-ci/scripts/ruby-version.yml

data/lib/generators/ciderizer/templates/cider-ci/jobs/rubocop.yml

@@ -26,6 +26,7 @@ rubocop:
         <% end %>
 
         _cider-ci_include:
+          - cider-ci/scripts/cleanup-rbenv.yml
           - cider-ci/scripts/bundle.yml
           - cider-ci/scripts/tmp-cache.yml
           - cider-ci/scripts/ruby-version.yml

data/lib/generators/ciderizer/templates/cider-ci/scripts/bundle.yml

@@ -1,2 +1,5 @@
 bundle:
-  body: sed 's/^source.*/source "http\:\/\/52.29.7.59:9292"/g' Gemfile > Gemfile.tmp ; mv Gemfile.tmp Gemfile && bundle install
+  body: sed 's/^source.*/source "<%= options.gemserver %>"/g' Gemfile > Gemfile.tmp ; mv Gemfile.tmp Gemfile && bundle install
+  exclusive-executor-resource: bundler
+  start-when:
+    - script: cleanup-rbenv

data/lib/generators/ciderizer/templates/cider-ci/scripts/cleanup-rbenv.yml

@@ -0,0 +1,2 @@
+cleanup-rbenv:
+  body: rm /home/cider-ci_exec-user/.rbenv/shims/.rbenv-shim -f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciderizer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Krzysztof Sakwerda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -83,15 +83,20 @@ files:
 - lib/ciderizer/version.rb
 - lib/generators/ciderizer/base_rails_generator.rb
 - lib/generators/ciderizer/ciderizer_generator.rb
+- lib/generators/ciderizer/konacha_generator.rb
+- lib/generators/ciderizer/options/bundle.rb
+- lib/generators/ciderizer/options/konacha.rb
 - lib/generators/ciderizer/options/rspec.rb
 - lib/generators/ciderizer/options/rubocop.rb
 - lib/generators/ciderizer/rspec_generator.rb
 - lib/generators/ciderizer/rubocop_generator.rb
 - lib/generators/ciderizer/templates/cider-ci.yml
+- lib/generators/ciderizer/templates/cider-ci/jobs/konacha.yml
 - lib/generators/ciderizer/templates/cider-ci/jobs/rspec.yml
 - lib/generators/ciderizer/templates/cider-ci/jobs/rubocop.yml
 - lib/generators/ciderizer/templates/cider-ci/scripts/bower.yml
 - lib/generators/ciderizer/templates/cider-ci/scripts/bundle.yml
+- lib/generators/ciderizer/templates/cider-ci/scripts/cleanup-rbenv.yml
 - lib/generators/ciderizer/templates/cider-ci/scripts/github_comment.yml
 - lib/generators/ciderizer/templates/cider-ci/scripts/postgres.yml
 - lib/generators/ciderizer/templates/cider-ci/scripts/rspec.yml