engine_cart 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d338f4c1822f3975c981752fe0e7ef0fb417f54
-  data.tar.gz: d7ca112daff894c79df45a376e804919b79b45f7
+  metadata.gz: 8aa18a8e8f45266a8f194866541e61ab3db7c9b8
+  data.tar.gz: 8ab588fb5abcb9c192c96f4bb95fbecf31f1a29f
 SHA512:
-  metadata.gz: cbf59d6d25f6f34f76d83a3e9495c03d5ac7a0dd3812d8dafa804e82f350a7a198f87a40d0d69ea387fed75c282864a8da73cdda754b2c754f19d12565c53be8
-  data.tar.gz: 2504e8bd319a7e6c9d239776d7b3e844ec887b6d4af0ac29cc96ef4d8ae54a30a0098f3eba6b91e2f686e297f865c2b7b2a04eeffb5a5614520a340377bc0fb0
+  metadata.gz: b2643ac9390770f6101da94bd5f720cb9621ba849da7ca9d374d341cbc8dd57bc4f1a44d1ec81bdb567044778f911e3cec47eb00493fa17124d25e300aaccc74
+  data.tar.gz: c6b91a8a882496a0e86abd115d3d4b458dafbd0b90a182c83a003efa128e4ef30a507d1be578ca9df88c0e0d5a7935ed390c2d9b587e8cd188438f760f2ee5d4

data/.engine_cart.yml

@@ -0,0 +1 @@
+destination: '.internal_test_gem'

data/.travis.yml

@@ -6,9 +6,7 @@ rvm:
 matrix:
   include:
     - rvm: '2.2.5'
-      env: "RAILS_VERSION=4.1.15"
-    - rvm: '2.2.5'
-      env: "RAILS_VERSION=4.2.6"
+      env: "RAILS_VERSION=4.2.7.1"
 
 env:
- - "RAILS_VERSION=5.0.0"
+ - "RAILS_VERSION=5.0.0.1"

data/Gemfile

@@ -4,8 +4,3 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-
-if ENV['RAILS_VERSION'] && ENV['RAILS_VERSION'] < '4.2'
-  gem 'sass', '~> 3.2.15'
-  gem 'sprockets', '~> 2.11.0'
-end

data/Rakefile

@@ -23,8 +23,6 @@ task :generate_test_gem => ['engine_cart:setup'] do
   IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/TODO/, "DONTCARE")})
   IO.write(".internal_test_gem/internal_test_gem.gemspec", File.open(".internal_test_gem/internal_test_gem.gemspec") {|f| f.read.gsub(/.*homepage.*/, "")})
 
-  EngineCart.destination = '.internal_test_gem'
-
   Rake::Task['engine_cart:inject_gemfile_extras'].invoke
   EngineCart.within_test_app do
     system "git init"

data/lib/engine_cart.rb

@@ -1,14 +1,10 @@
+require 'engine_cart/configuration'
 require "engine_cart/version"
 require 'engine_cart/gemfile_stanza'
 require 'bundler'
 
 module EngineCart
   require "engine_cart/engine" if defined? Rails
-  require 'engine_cart/params'
-
-  def self.current_engine_name
-    engine_name || File.basename(Dir.glob("*.gemspec").first, '.gemspec')
-  end
 
   def self.load_application! path = nil
     require File.expand_path("config/environment", path || EngineCart.destination)
@@ -25,11 +21,11 @@ module EngineCart
   def self.fingerprint
     @fingerprint || (@fingerprint_proc || method(:default_fingerprint)).call
   end
-  
+
   def self.fingerprint= fingerprint
     @fingerprint = fingerprint
   end
-  
+
   def self.fingerprint_proc= fingerprint_proc
     @fingerprint_proc = fingerprint_proc
   end
@@ -48,6 +44,18 @@ module EngineCart
     { 'RUBY_DESCRIPTION' => RUBY_DESCRIPTION, 'BUNDLE_GEMFILE' => Bundler.default_gemfile.to_s }.reject { |k, v| v.nil? || v.empty? }.to_s
   end
 
+  def self.configuration(options = {})
+    @configuration ||= EngineCart::Configuration.new(options)
+  end
+
+  class << self
+    %w(destination engine_name templates_path template rails_options).each do |method|
+      define_method(method) do
+        configuration.send(method)
+      end
+    end
+  end
+
   def self.check_for_gemfile_stanza
     return unless File.exist? 'Gemfile'
 

data/lib/engine_cart/configuration.rb

@@ -0,0 +1,98 @@
+require 'yaml'
+
+module EngineCart
+  class Configuration
+    attr_reader :options
+
+    def initialize(options = {})
+      @verbose = options[:verbose]
+
+      @options = load_configs(Array[options[:config]]).merge(options)
+    end
+
+    def load_configs(config_files)
+      config = default_config
+
+      (default_configuration_paths + config_files.compact).each do |p|
+        path = File.expand_path(p)
+        next unless File.exist? path
+        config.merge!(read_config(path))
+      end
+
+      config
+    end
+
+    ##
+    # Name of the engine we're testing
+    def engine_name
+      options[:engine_name]
+    end
+
+    ##
+    # Destination to generate the test app into
+    def destination
+      options[:destination]
+    end
+
+    ##
+    # Path to a Rails application template
+    def template
+      options[:template]
+    end
+
+    ##
+    # Path to test app templates to make available to
+    # the test app generator
+    def templates_path
+      options[:templates_path]
+    end
+
+    ##
+    # Additional options when generating a test rails application
+    def rails_options
+      options[:rails_options]
+    end
+
+    def default_destination
+      '.internal_test_app'
+    end
+
+    def default_engine_name
+      File.basename(Dir.glob('*.gemspec').first, '.gemspec')
+    end
+
+    def verbose?
+      @verbose || (options && !!options.fetch(:verbose, false))
+    end
+
+    private
+
+    def default_config
+      {
+        engine_name: ENV['CURRENT_ENGINE_NAME'] || default_engine_name,
+        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']
+      }
+    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))
+      unless config
+        $stderr.puts "Unable to parse config #{config_file}" if verbose?
+        return {}
+      end
+      convert_keys(config)
+    end
+
+    def convert_keys(hash)
+      hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+    end
+
+    def default_configuration_paths
+      ['~/.engine_cart.yml', '.engine_cart.yml']
+    end
+  end
+end

data/lib/engine_cart/gemfile_stanza.rb

@@ -1,5 +1,3 @@
-require 'engine_cart/params'
-
 module EngineCart
   def self.gemfile_stanza_check_line
     "engine_cart stanza: 0.10.0"

data/lib/engine_cart/tasks/engine_cart.rake

@@ -69,10 +69,10 @@ namespace :engine_cart do
   task :inject_gemfile_extras => [:setup] do
     # Add our gem and extras to the generated Rails app
     open(File.expand_path('Gemfile', EngineCart.destination), 'a') do |f|
-      gemfile_extras_path = File.expand_path("Gemfile.extra", EngineCart.templates_path)
+      f.puts "gem '#{EngineCart.engine_name}', path: '#{File.expand_path('.')}'"
 
-      f.write File.read(gemfile_extras_path) if File.exist?(gemfile_extras_path)
-      f.write "gem '#{EngineCart.current_engine_name}', path: '#{File.expand_path('.')}'"
+      gemfile_extras_path = File.expand_path("Gemfile.extra", EngineCart.templates_path)
+      f.puts "eval_gemfile File.expand_path('#{gemfile_extras_path}', File.dirname(__FILE__)) if File.exist?('#{gemfile_extras_path}')"
     end
   end
 
@@ -126,11 +126,11 @@ namespace :engine_cart do
 end
 
 def within_test_app
-  puts "travis_fold:start:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
+  puts "\rtravis_fold:start:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
   Dir.chdir(EngineCart.destination) do
     Bundler.with_clean_env do
       yield
     end
   end
-  puts "travis_fold:end:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
+  puts "\rtravis_fold:end:enginecart-bundler-cleanenv\r" if ENV['TRAVIS'] == 'true'
 end

data/lib/engine_cart/version.rb

@@ -1,3 +1,3 @@
 module EngineCart
-  VERSION = '0.10.0'
+  VERSION = '1.0.0'
 end

data/lib/generators/engine_cart/install_generator.rb

@@ -24,7 +24,7 @@ module EngineCart
           # after setting up the application
 
           def install_engine
-            generate '#{EngineCart.current_engine_name}:install'
+            generate '#{EngineCart.engine_name}:install'
           end
         end
 

data/spec/integration/engine_cart_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe "EngineCart powered application" do
-  EngineCart.destination = File.expand_path("../../.internal_test_gem", File.dirname(__FILE__))
-
   it "should have the test_app_templates pre-generated" do
     expect(File).to exist File.expand_path("spec/test_app_templates", EngineCart.destination)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine_cart
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".engine_cart.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -81,9 +82,9 @@ files:
 - Rakefile
 - engine_cart.gemspec
 - lib/engine_cart.rb
+- lib/engine_cart/configuration.rb
 - lib/engine_cart/engine.rb
 - lib/engine_cart/gemfile_stanza.rb
-- lib/engine_cart/params.rb
 - lib/engine_cart/rake_task.rb
 - lib/engine_cart/tasks/engine_cart.rake
 - lib/engine_cart/version.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Helper for testing Rails Engines sanely

data/lib/engine_cart/params.rb

@@ -1,38 +0,0 @@
-module EngineCart
-  class << self
-
-    ##
-    # Name of the engine we're testing
-    attr_accessor :engine_name
-
-    ##
-    # Destination to generate the test app into
-    attr_accessor :destination
-
-    ##
-    # Path to a Rails application template
-    attr_accessor :template
-
-    ##
-    # Path to test app templates to make available to
-    # the test app generator
-    attr_accessor :templates_path
-
-
-    ##
-    # Additional options when generating a test rails application
-    attr_accessor :rails_options
-
-  end
-
-  self.engine_name = ENV["CURRENT_ENGINE_NAME"]
-
-  def self.default_destination
-    ('.internal_test_app' if File.exist? '.internal_test_app') || ('spec/internal' if File.exist? 'spec/internal') || '.internal_test_app'
-  end
-
-  self.destination = ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || default_destination
-  self.template = ENV["ENGINE_CART_TEMPLATE"]
-  self.templates_path = ENV['ENGINE_CART_TEMPLATES_PATH'] || "./spec/test_app_templates"
-  self.rails_options = ENV['ENGINE_CART_RAILS_OPTIONS']
-end