railslove-suspenders 0.1.1 → 0.1.2

data/.travis.yml

@@ -2,5 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+install:
+  - bundle install
 notifications:
   email: false

data/Gemfile.lock

@@ -1,88 +1,100 @@
 PATH
   remote: .
   specs:
-    railslove-suspenders (0.1.0)
+    railslove-suspenders (0.1.1)
       bundler (~> 1.3)
-      hub (~> 1.10)
-      rails (= 3.2.13)
+      rails (= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
       mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
+    atomic (1.1.14)
+    builder (3.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.3.8)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
+    ffi (1.9.0)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
     hike (1.2.3)
-    hub (1.10.6)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.0)
+    i18n (0.6.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.6)
+    mime-types (1.25)
+    minitest (4.7.5)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
@@ -91,4 +103,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aruba (~> 0.5)
+  cucumber (~> 1.2)
   railslove-suspenders!

data/README.md

@@ -34,12 +34,12 @@ It includes application gems like:
 
 And testing gems like:
 
-* [Mocha](https://github.com/freerange/mocha) for stubbing and spying
 * [Capybara](https://github.com/jnicklas/capybara) and
   [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
   integration testing
 * [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
 * [RSpec](https://github.com/rspec/rspec) for unit testing
+* [RSpec Mocks](https://github.com/rspec/rspec-mocks) for stubbing and spying
 * [Shoulda Matchers](https://github.com/thoughtbot/shoulda-matchers) for common
   RSpec matchers
 * [Timecop](https://github.com/jtrupiano/timecop-console) for testing time
@@ -52,8 +52,8 @@ Suspenders also comes with:
 * Override recipient emails in staging environment.
 * Rails' flashes set up and in application layout.
 * A few nice time formats set up for localization.
-* [Heroku-recommended asset pipeline
-  settings](https://devcenter.heroku.com/articles/rails3x-asset-pipeline-cedar/).
+* [Heroku-recommended
+  settings](https://devcenter.heroku.com/articles/rails4-getting-started).
 
 Heroku
 ------
@@ -70,7 +70,10 @@ This has the same effect as running:
 Github
 ------
 
-You can optionally create a Github repository:
+You can optionally create a Github repository for the suspended Rails app. It
+requires that you have [Hub](https://github.com/github/hub) on your system:
+ 
+    curl http://hub.github.com/standalone -sLo ~/bin/hub && chmod +x ~/bin/hub
 
     suspenders app --github organization/project
 

data/features/step_definitions/suspenders_steps.rb

@@ -24,12 +24,12 @@ When 'I ensure no databases exist for "$project_name"' do |project_name|
 end
 
 When 'I suspend a project called "$project_name"' do |project_name|
-  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
+  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'railslove-suspenders'), File.dirname(__FILE__))
   run_simple "#{suspenders_bin} #{project_name}"
 end
 
-When /^I suspend a project called "([^"]*)" with:$/ do |project_name, arguments_table|
-  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
+When %r{I suspend a project called "([^"]*)" with:} do |project_name, arguments_table|
+  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'railslove-suspenders'), File.dirname(__FILE__))
   arguments = arguments_table.hashes.inject([]) do |accum, argument|
     accum << "#{argument['argument']}=#{argument['value']}"
   end.join
@@ -49,20 +49,20 @@ Then 'I can cleanly rake the project' do
   }
 end
 
-Then /^"(.*)" should not be installed$/ do |gem_name|
+Then %r{"(.*)" should not be installed} do |gem_name|
   in_current_dir do
     system("bundle show #{gem_name} 2>&1 > /dev/null").should be_false
   end
 end
 
-Then /^"(.*)" should not be included in "(.*)"$/ do |content, file_path|
+Then %r{"(.*)" should not be included in "(.*)"} do |content, file_path|
   check_file_content file_path, content, false
 end
 
-Then /^the "([^"]*)" Heroku app should exist$/ do |app_name|
+Then %r{the "([^"]*)" Heroku app should exist} do |app_name|
   FakeHeroku.should have_created_app(app_name)
 end
 
-Then /^the "([^"]*)" Github repo should exist$/ do |repo_name|
+Then %r{the "([^"]*)" Github repo should exist} do |repo_name|
   FakeGithub.should have_created_repo(repo_name)
-end
+end

data/lib/railslove-suspenders/app_builder.rb

@@ -61,12 +61,6 @@ module RailsloveSuspenders
       #  "Mail.register_interceptor RecipientInterceptor.new(ENV['EMAIL_RECIPIENTS'])\n"
     end
 
-    def initialize_on_precompile
-      inject_into_file 'config/application.rb',
-        "\n    config.assets.initialize_on_precompile = false",
-        :after => 'config.assets.enabled = true'
-    end
-
     def create_partials_directory
       empty_directory 'app/assets/stylesheets/base'
       empty_directory 'app/assets/stylesheets/modules'
@@ -106,11 +100,6 @@ module RailsloveSuspenders
       directory 'javascripts', 'app/assets/javascripts'
     end
 
-    def add_jquery_ui
-      inject_into_file 'app/assets/javascripts/application.js',
-        "//= require jquery-ui\n", :before => '//= require_tree .'
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         :force => true
@@ -141,11 +130,6 @@ module RailsloveSuspenders
     def configure_rspec
       remove_file '.rspec'
       copy_file 'rspec', '.rspec'
-      prepend_file 'spec/spec_helper.rb', simplecov_init
-
-      replace_in_file 'spec/spec_helper.rb',
-        '# config.mock_with :mocha',
-        'config.mock_with :mocha'
 
       rspec_expect_syntax = <<-RUBY
 
@@ -205,7 +189,7 @@ module RailsloveSuspenders
 
     def configure_capybara_webkit
       append_file 'spec/spec_helper.rb' do
-        "\nCapybara.javascript_driver = :webkit"
+        "\nCapybara.javascript_driver = :webkit\n"
       end
     end
 
@@ -231,14 +215,7 @@ module RailsloveSuspenders
     def gitignore_files
       concat_file 'suspenders_gitignore', '.gitignore'
       [
-        'app/models',
-        'app/assets/images',
-        'db/migrate',
-        'log',
-        'spec/support',
         'spec/lib',
-        'spec/models',
-        'spec/views',
         'spec/controllers',
         'spec/helpers',
         'spec/support/matchers',
@@ -246,7 +223,7 @@ module RailsloveSuspenders
         'spec/support/shared_examples'
       ].each do |dir|
         run "mkdir #{dir}"
-        run "touch #{dir}/.gitkeep"
+        run "touch #{dir}/.keep"
       end
     end
 
@@ -298,7 +275,7 @@ module RailsloveSuspenders
 
     def setup_default_rake_task
       append_file 'Rakefile' do
-        "task(:default).clear\ntask :default => [:spec]"
+        "task(:default).clear\ntask :default => [:spec]\n"
       end
     end
 
@@ -315,8 +292,5 @@ module RailsloveSuspenders
       IO.read find_in_source_paths('factories_spec_rake_task.rb')
     end
 
-    def simplecov_init
-      IO.read find_in_source_paths('simplecov_init.rb')
-    end
   end
 end

data/lib/railslove-suspenders/generators/app_generator.rb

@@ -30,7 +30,6 @@ module RailsloveSuspenders
       invoke :setup_staging_environment
       invoke :create_suspenders_views
       invoke :create_common_javascripts
-      # invoke :add_jquery_ui
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
@@ -90,7 +89,6 @@ module RailsloveSuspenders
     def setup_staging_environment
       say 'Setting up the staging environment'
       build :setup_staging_environment
-      build :initialize_on_precompile
     end
 
     def create_suspenders_views
@@ -108,11 +106,6 @@ module RailsloveSuspenders
       build :create_common_javascripts
     end
 
-    def add_jquery_ui
-      say 'Add jQuery ui to the standard application.js'
-      build :add_jquery_ui
-    end
-
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer

data/lib/railslove-suspenders/version.rb

@@ -1,4 +1,4 @@
 module RailsloveSuspenders
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   # suspenders 1.3.0
 end

data/railslove-suspenders.gemspec

@@ -6,10 +6,9 @@ require 'date'
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'bundler', '~> 1.3'
-  s.add_dependency 'hub', '~> 1.10'
   s.add_dependency 'rails', '4.0.0'
-  # s.add_development_dependency 'aruba', '~> 0.5'
-  # s.add_development_dependency 'cucumber', '~> 1.2'
+  s.add_development_dependency 'aruba', '~> 0.5'
+  s.add_development_dependency 'cucumber', '~> 1.2'
   s.authors = ['stephanpavlovic']
   s.date = Date.today.strftime('%Y-%m-%d')
 

data/templates/Gemfile_clean

@@ -1,20 +1,16 @@
 source 'https://rubygems.org'
 
 gem 'airbrake'
-gem 'compass'
+gem 'coffee-rails'
+gem 'compass-rails'
 gem 'jquery-rails'
 gem 'pg'
 gem 'rails', '>= 4.0.0'
 gem 'quiet_assets'
+gem 'sass-rails'
 gem 'newrelic_rpm'
 gem 'haml-rails'
-
-group :assets do
-  gem 'coffee-rails'
-  gem 'compass-rails'
-  gem 'sass-rails'
-  gem 'uglifier'
-end
+gem 'uglifier'
 
 group :development do
   gem 'better_errors'
@@ -24,11 +20,11 @@ end
 
 group :development, :test do
   gem 'factory_girl_rails'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '>= 2.14'
 end
 
 group :test do
-  gem 'capybara-webkit', '>= 0.14.1'
+  gem 'capybara-webkit', '>= 1.0.0'
   gem 'database_cleaner'
   gem 'launchy'
   gem 'shoulda-matchers'

data/templates/disable_xml_params.rb

@@ -1,3 +1,3 @@
 # Protect against injection attacks
 # http://www.kb.cert.org/vuls/id/380039
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)
+ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/stylesheets/application.css.sass

@@ -10,5 +10,5 @@
 @import base/sprites
 @import base/typography
 
-@import layout/*
-@import modules/*
+// @import layout/*
+// @import modules/*

data/templates/suspenders_gitignore

@@ -1,10 +1,16 @@
 !.keep
 *.DS_Store
+*.swo
 *.swp
-.env
+.bundle
+.sass-cache/
 bin/stubs
 coverage/*
+db/*.sqlite3
+db/schema.rb
+log/*
 public/system
 rerun.txt
 tags
-vendor/bundler_gems
+tmp/*
+tmp/**/*

data/templates/suspenders_layout.html.haml

@@ -7,6 +7,6 @@
     = stylesheet_link_tag :application, :media => 'all'
     = csrf_meta_tags
   %body{class: controller_name, id: "#{controller_name}_#{action_name}"}
-    = render 'flashes'
+    = render 'layouts/flashes'
     = yield
-    = render 'javascript'
+    = render 'layouts/javascript'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railslove-suspenders
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -28,37 +28,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: hub
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
+        version: '1.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '1.2'
 description: ! 'Suspenders is a base Rails project that you can upgrade. It is used
   by