engine_cart 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e5a98b53447f425af2ba567451f40e31009567d
-  data.tar.gz: dcec987662b19522aec5513d9f50184f873691c1
+  metadata.gz: 8180b96510ff7c10e9a21625cca64768f90b52ee
+  data.tar.gz: 5872062cf96944e5ee713caf54dd49e8afe846e5
 SHA512:
-  metadata.gz: 6240b09554dee5562d48fa9ce5d3e7d52bee768933f932d018e9c95fb71ef35aa2d8a3915efc902b4212bb9f424af7ebac95f361ca00e7269dfc65e0d150cedc
-  data.tar.gz: 52e25bb488595a97f9b04cc0ec8a8d1577442374ee6d1d0d9beea4ecdd92bcbb8f42e2f800b6764c8f7bb30e71a022c5b070ac7aa25b6339479b7061cec59413
+  metadata.gz: 64e60694001844c9c0f171dc72364740beae0395a331f65609c73911f508eb5c265ddc785882318799fef9831e8d07b92e58460529ea58c567148b37b1b3fecd
+  data.tar.gz: 71e3fdbff0b743638aa212a4cc9b2ec313dd00b6c6ad1f711bf649f304128ecf0821f2b18d9f5dfbd56f7db629322208ef0c58985e8e0c7c2c9680b177df8e7e

data/.travis.yml

@@ -1,7 +1,16 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.4.0
+  - 2.4.1
+
+matrix:
+  include:
+    - rvm: jruby-9.1.13.0
+    - rvm: 2.3.4
+      env: "RAILS_VERSION=5.0.6"
+  allow_failures:
+    - rvm: jruby-9.1.13.0
+  fast_finish: true
 
 env:
- - "RAILS_VERSION=5.0.1"
+ - "RAILS_VERSION=5.1.4"

data/README.md

@@ -32,7 +32,7 @@ Or install it yourself as:
 
 ### engine_cart rake tasks
 
-To use engine_cart's rake tasks, in *your* engine's Rakefile add:
+To use engine_cart's rake tasks, add the following to *your* engine's Rakefile (e.g. `your_engine/Rakefile`):
 
 ```ruby
 require 'engine_cart/rake_task'

data/lib/engine_cart/configuration.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'erb'
 
 module EngineCart
   class Configuration
@@ -50,7 +51,7 @@ module EngineCart
     ##
     # Additional options when generating a test rails application
     def rails_options
-      options[:rails_options]
+      Array(options[:rails_options])
     end
 
     def default_destination
@@ -73,10 +74,19 @@ module EngineCart
         destination: ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || default_destination,
         template: ENV['ENGINE_CART_TEMPLATE'],
         templates_path: ENV['ENGINE_CART_TEMPLATES_PATH'] || './spec/test_app_templates',
-        rails_options: ENV['ENGINE_CART_RAILS_OPTIONS']
+        rails_options: parse_options(ENV['ENGINE_CART_RAILS_OPTIONS'])
       }
     end
 
+    # Split a string of options into individual options.
+    # @example
+    #   parse_options('--skip-foo --skip-bar -d postgres --skip-lala')
+    #   # => ["--skip-foo", "--skip-bar", "-d postgres", "--skip-lala"]
+    def parse_options(options)
+      return if options.nil?
+      options.scan(/(--[^\s]+|-[^\s]+\s+[^\s]+)/).flatten
+    end
+
     def read_config(config_file)
       $stdout.puts "Loading configuration from #{config_file}" if verbose?
       config = YAML.load(ERB.new(IO.read(config_file)).result(binding))
@@ -95,4 +105,4 @@ module EngineCart
       ['~/.engine_cart.yml', '.engine_cart.yml']
     end
   end
-end
+end

data/lib/engine_cart/tasks/engine_cart.rake

@@ -36,7 +36,7 @@ namespace :engine_cart do
 
           # Using the Rails generator directly, instead of shelling out, to
           # ensure we use the right version of Rails.
-          Rails::Generators::AppGenerator.start(['internal', '--skip_spring', EngineCart.rails_options, ("-m #{EngineCart.template}" if EngineCart.template)].compact)
+          Rails::Generators::AppGenerator.start(['internal', '--skip_spring', *EngineCart.rails_options, ("-m #{EngineCart.template}" if EngineCart.template)].compact)
         end
         exit 0
       end

data/lib/engine_cart/version.rb

@@ -1,3 +1,3 @@
 module EngineCart
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Helper for testing Rails Engines sanely