bakeware 1.1.6 → 1.1.7

data/CONTRIBUTING.md

@@ -13,10 +13,7 @@ a test!
 
 5. Push to your fork and submit a pull request.
 
-
-At this point you're waiting on us. We like to at least comment on, if not
-accept, pull requests within three business days (and, typically, one business
-day). We may suggest some changes or improvements or alternatives.
+Then it's up to us when we pull in your change. Have patience.
 
 Some things that will increase the chance that your pull request is accepted,
 taken straight from the Ruby on Rails guide:
@@ -33,6 +30,4 @@ Syntax:
 * Prefer &&/|| over and/or.
 * my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 * a = b and not a=b.
-* Follow the conventions you see used in the source already.
-
-And in case we didn't emphasize it enough: we love tests!
+* Follow the conventions you see used in the source already.

data/Gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: .
   specs:
-    bakeware (1.1.6)
+    bakeware (1.1.7)
       bundler (>= 1.1)
       hub (~> 1.10.2)
-      rails (>= 3.2.11)
+      rails (>= 3.2.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -58,40 +58,40 @@ GEM
       json (>= 1.4.6)
     hike (1.2.1)
     hub (1.10.4)
-    i18n (0.6.1)
+    i18n (0.6.2)
     journey (1.0.4)
     json (1.6.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.21)
+    multi_json (1.6.1)
     polyglot (0.3.3)
-    rack (1.4.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -107,7 +107,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     term-ansicolor (1.0.7)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot

data/README.md

@@ -29,6 +29,8 @@ This is the default mode. Comes with
 * [newrelic_rpm](/newrelic/rpm) for analytics about the performance of your app
 * [pg](/ged/ruby-pg) for PostgreSQL 
 
+As well as some other development tools (like pry-rails).
+
 Meaty Mode
 ---------
 
@@ -61,8 +63,10 @@ Testing
 Bakeware also comes with testing gems, including (but not limited to):
 
 * [Factory Girl](/thoughtbot/factory_girl) for test data
+* [mocha](/freerange/mocha) for mocking and stubbing
 * [simplecov](/colszowka/simplecov) for testing coverage analytics
 * [Timecop](/jtrupiano/timecop) for testing time
+* [turn](/TwP/turn) for better test reporting
 
 We don't use RSpec often, and even less often do we use minitest. So manually include those if you want.
 
@@ -137,7 +141,7 @@ Credits
 
 ![Oven Bits](http://ovenbits.com/images/logo-color.png)
 
-Bakeware is maintained and funded by [Oven Bits](http://ovenbits.com)
+Bakeware is maintained and funded by [Oven Bits](http://ovenbits.com) and Court Simas.
 
 The names and logos for Oven Bits are trademarks of Oven Bits
 

data/bakeware.gemspec

@@ -26,7 +26,7 @@ We use it at Oven Bits for most of our apps. YMMV, but we get decent mileage out
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'rails', '>= 3.2.11'
+  s.add_dependency 'rails', '>= 3.2.12'
   s.add_dependency 'bundler', '>= 1.1'
   s.add_dependency 'hub', '~> 1.10.2'
 

data/lib/bakeware/app_builder.rb

@@ -99,6 +99,7 @@ module Bakeware
       copy_file 'asset_sync', 'config/initializers/asset_sync.rb'
       copy_file 'timeout', 'config/initializers/timeout.rb'
       copy_file 'Procfile', 'Procfile'
+      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
       inject_into_file 'Procfile', "worker: env QUEUE=* bundle exec rake resque:work",
         :after => "\n"
       replace_in_file 'Procfile',
@@ -136,7 +137,6 @@ module Bakeware
       copy_file 'app/assets/stylesheets/application.css',
         'app/assets/stylesheets/application.css.scss'
       remove_file 'app/assets/stylesheets/application.css'
-      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
       create_file 'app/assets/stylesheets/_screen.scss'
     end
 

data/lib/bakeware/version.rb

@@ -1,3 +1,3 @@
 module Bakeware
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

data/templates/Gemfile_additions

@@ -5,19 +5,23 @@ gem 'haml'
 
 group :development do
   gem 'foreman'
+  gem 'mailcatcher'
+  gem 'pry-rails'
 end
 
 group :development, :test do
   gem 'guard'
   gem 'guard-spork'
-  gem 'sham_rack'
 end
 
 group :test do
   gem 'factory_girl_rails'
-  gem 'database_cleaner'
-  gem 'simplecov', require: false
+  gem 'mocha', :require => false
+  gem 'shoulda-context'
+  gem 'shoulda-matchers'
+  gem 'simplecov'
   gem 'timecop'
+  gem 'turn'
 end
 
 group :staging, :production do

data/templates/bakeware_layout.html.erb.erb

@@ -3,17 +3,13 @@
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
-  <title><%%= page_title %></title>
+  <title><%%#= page_title %></title>
   <%%= stylesheet_link_tag :application, :media => 'all' %>
   <%%= csrf_meta_tags %>
 </head>
-<body class="<%%= body_class %>">
+<body>
   <header>
-    <%% if signed_in? -%>
-      <%%= link_to "Sign out", sign_out_path, :method => :delete %>
-    <%% else -%>
-      <%%= link_to "Sign in", sign_in_path %>
-    <%% end -%>
+    
   </header>
   <%%= render 'flashes' -%>
   <%%= yield %>

data/templates/sample.env

@@ -1,2 +1 @@
-# http://ddollar.github.com/foreman/
 RACK_ENV=development

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bakeware
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Generate a Rails app using Oven Bits' favorite flavors and ingredients.