shoestrap 1.0.0.pre1 → 1.0.0.pre2

data/lib/generators/shoestrap/foundation_generator.rb

@@ -1,11 +1,7 @@
 require 'rails/generators'
 
 module Shoestrap
-  class FoundationGenerator < Rails::Generators::Base
-
-    def source_paths
-      [File.join(File.dirname(__FILE__), '../../../templates/foundation_generator')]
-    end
+  class FoundationGenerator < BaseGenerator
 
     def copy_application_sass
       copy_file '_settings.css.sass', 'app/assets/stylesheets/_settings.css.sass', force: true
@@ -20,5 +16,9 @@ module Shoestrap
       inject_into_file 'app/assets/stylesheets/application.css.sass', "// Foundation\n@import foundation\n\n", after: "@import settings\n\n"
       inject_into_file 'app/assets/stylesheets/application.css.sass', "// IE8 Foundation Grid Fix\n@import ie8_grid\n\n", after: "@import foundation\n\n"
     end
+
+    def install_simple_form
+      generate 'simple_form:install --foundation'
+    end
   end
 end

data/lib/generators/shoestrap/kuhsaft_generator.rb

@@ -1,11 +1,7 @@
 require 'rails/generators'
 
 module Shoestrap
-  class KuhsaftGenerator < Rails::Generators::Base
-
-    def source_paths
-      [File.join(File.dirname(__FILE__), '../../../templates/kuhsaft_generator')]
-    end
+  class KuhsaftGenerator < BaseGenerator
 
     def install_migrations
       rake 'kuhsaft:install:migrations'
@@ -30,5 +26,10 @@ module Shoestrap
     def add_default_image_size
       copy_file 'kuhsaft.rb', 'config/initializers/kuhsaft.rb'
     end
+
+    def add_translations
+      (I18n.available_locales - [:de, :en]).each {|l| generate "kuhsaft:translations:add #{l}" }
+    end
+
   end
 end

data/lib/generators/shoestrap/mailcatcher_generator.rb

@@ -10,5 +10,17 @@ module Shoestrap
         "config.action_mailer.delivery_method = :smtp"
       end
     end
+
+    def add_mailcacher_notes_in_readme
+      readme = 'README.md'
+      create_file readme unless File.exists? readme
+      append_to_file readme, <<-DOCUMENTATION
+# Mailcatcher
+This application uses Mailcatcher in development mode.
+MailCatcher runs a super simple SMTP server which catches any message sent to it to display in a web interface. Run mailcatcher, set your favourite app to deliver to smtp://127.0.0.1:1025 instead of your default SMTP server, then check out http://127.0.0.1:1080 to see the mail that's arrived so far.
+
+For more information inquire http://mailcatcher.me/
+      DOCUMENTATION
+    end
   end
 end

data/lib/generators/shoestrap/simple_navigation_generator.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+
+module Shoestrap
+  class SimpleNavigationGenerator < BaseGenerator
+
+    def install_simple_navigation
+      generate 'navigation_config'
+    end
+
+    def copy_navigation_rb
+      copy_file 'navigation.rb', 'config/navigation.rb', force: true
+    end
+  end
+end

data/lib/generators/shoestrap/smacss_file_generator.rb

@@ -2,11 +2,7 @@ require 'rails/generators'
 require_relative '../../shoestrap/shell'
 
 module Shoestrap
-  class SmacssFilesGenerator < Rails::Generators::Base
-
-    def source_paths
-      [File.join(File.dirname(__FILE__), '../../../templates/smacss_generator')]
-    end
+  class SmacssFilesGenerator < BaseGenerator
 
     def remove_application_css
       remove_file 'app/assets/stylesheets/application.css'

data/lib/generators/shoestrap/view_files_generator.rb

@@ -0,0 +1,11 @@
+require 'rails/generators'
+
+module Shoestrap
+  class ViewFilesGenerator < BaseGenerator
+    def copy_views
+      Dir[File.join(source_paths.first,'*')].each do |file|
+        directory File.basename(file), 'app/views/'
+      end
+    end
+  end
+end

data/lib/shoestrap/application_generator.rb

@@ -1,5 +1,6 @@
 require 'active_support/inflector'
 require_relative 'shell'
+require_relative '../generators/shoestrap/base_generator'
 Dir[File.join(File.dirname(__FILE__), '../generators/shoestrap/*_generator.rb')].each{ |f| require f }
 
 module Shoestrap
@@ -26,13 +27,12 @@ module Shoestrap
         end
 
         install_gems(required_gems(options))
-        setup_database
-        setup_smacss_files
-        setup_coffee_files
-        setup_css_framework(options[:css])
-        setup_bdd_environment
-        setup_mailcatcher
-        setup_kuhsaft
+        generators = [
+          'database', 'smacss_files', 'coffee_files', options[:css],
+          'bdd', 'mailcatcher', 'simple_navigation', 'view_files'
+        ]
+        generators << 'kuhsaft' if options[:kuhsaft]
+        generators.each{|name| call_generator name }
       end
     end
 
@@ -42,40 +42,16 @@ module Shoestrap
       reload_gemfile_for_application
     end
 
-    def setup_database
-      Shoestrap::DatabaseGenerator.start
-    end
-
-    def setup_smacss_files
-      Shoestrap::SmacssFilesGenerator.start
-    end
-
-    def setup_coffee_files
-      Shoestrap::CoffeeFilesGenerator.start
-    end
-
-    def setup_css_framework(framework)
-      "Shoestrap::#{"#{framework}_generator".camelcase}".constantize.start
-    end
-
-    def setup_bdd_environment
-      Shoestrap::BddGenerator.start
-    end
-
-    def setup_kuhsaft
-      Shoestrap::KuhsaftGenerator.start
-    end
-
-    def setup_mailcatcher
-      Shoestrap::MailcatcherGenerator.start
+    def call_generator(name)
+      "Shoestrap::#{"#{name}_generator".camelcase}".constantize.start
     end
 
     def required_gems(options)
-      gems = []
-      gems << 'kuhsaft' if options[:kuhsaft]
-      gems << 'bootstrap-sass' if options[:css] == 'bootstrap'
-      gems << 'zurb-foundation' if options[:css] == 'foundation'
-      gems
+      Array.new.tap do |gems|
+        gems << 'kuhsaft' if options[:kuhsaft]
+        gems << 'bootstrap-sass' if options[:css] == 'bootstrap'
+        gems << 'zurb-foundation' if options[:css] == 'foundation'
+      end
     end
 
     def apply_special_sauce(application_name)

data/lib/shoestrap/shell.rb

@@ -2,6 +2,7 @@ module Shoestrap
   module Shell
     extend self
 
+    # aa NOTE: do we really need a wrapper for a simple command like system?
     def self.exec(command)
       system "#{command}"
     end

data/lib/shoestrap/version.rb

@@ -1,3 +1,3 @@
 module Shoestrap
-  VERSION = "1.0.0.pre1"
+  VERSION = "1.0.0.pre2"
 end

data/shoestrap.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["felipekaufmann@gmail.com"]
   spec.description   = %q{SC Bootstrapper and Generators}
   spec.summary       = %q{Rails App Bootstrapper and Generator used at Screen Concept}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/screenconcept/shoestrap"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -20,11 +20,20 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-debugger"
   spec.add_development_dependency "rspec", '2.14.0.rc1'
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "ruby_gntp"
+  #spec.add_development_dependency "ruby_gntp"
+  spec.add_development_dependency "terminal-notifier-guard"
+
+  # we don't need these gems but perhaps travis resolves the gems on spawning time and prohibits
+  # other gems afterwards.
+  if ENV['TRAVIS'] || ENV['CI'] || ENV['CIRCLECI']
+    spec.add_development_dependency "bootstrap-sass"
+    spec.add_development_dependency "kuhsaft"
+    spec.add_development_dependency "zurb-foundation"
+  end
 
   spec.add_dependency 'rails', '4.0.0'
   spec.add_dependency 'airbrake'

data/spec/shoestrap/application_generator_spec.rb

@@ -5,6 +5,29 @@ module Shoestrap
   describe ApplicationGenerator do
 
     let(:default_options) { { css: 'bootstrap', database: 'postgresql', kuhsaft: true } }
+    let(:template) { (Pathname.new(__FILE__) + '../../../templates/application_generator/application_template.rb').realpath }
+
+    describe 'rails template' do
+      it 'should use current shoestrap version' do
+        tp = double(:template_processor)
+        tp.should_receive(:remove_file).with('app/views/layouts/application.html.erb')
+        tp.should_receive(:require).with(File.expand_path('../../lib/shoestrap/version'))
+        tp.should_receive(:inject_into_file)
+        tp.stub(:directory)
+        tp.stub(:copy_file)
+        tp.stub(:application)
+        tp.should_receive(:gem_group).twice
+        expected_gems = ['shoestrap']
+        tp.stub(:gem) {|*args|
+          expected_gems.delete(args[0])
+          if args[0] == 'shoestrap'
+            expect(args[1]).to eq(Shoestrap::VERSION)
+          end
+        }
+        tp.instance_eval template.read
+        expect(expected_gems).to eq []
+      end
+    end
 
     describe '#start' do
       it 'says it is going to generate an app' do
@@ -36,45 +59,39 @@ module Shoestrap
     describe '#shoestrap_generators' do
 
       before :each do
-        ApplicationGenerator.stub(:setup_bdd_environment)
-        ApplicationGenerator.stub(:setup_database)
-        ApplicationGenerator.stub(:setup_css_framework)
-        ApplicationGenerator.stub(:setup_smacss_files)
-        ApplicationGenerator.stub(:setup_coffee_files)
-        ApplicationGenerator.stub(:setup_kuhsaft)
+        ApplicationGenerator.stub(:call_generator)
         ApplicationGenerator.stub(:install_gems)
         ApplicationGenerator.stub(:apply_special_sauce)
-        ApplicationGenerator.stub(:setup_mailcatcher)
         Dir.stub(:chdir).and_yield
       end
 
-      it 'installs requried gems' do
+      it 'installs required gems' do
         expect(ApplicationGenerator).to receive(:install_gems)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
       it 'sets up the css framework' do
-        expect(ApplicationGenerator).to receive(:setup_css_framework)
+        expect(ApplicationGenerator).to receive(:call_generator)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
       it 'sets up the smacss files' do
-        expect(ApplicationGenerator).to receive(:setup_smacss_files)
+        expect(ApplicationGenerator).to receive(:call_generator)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
       it 'sets up the coffee files' do
-        expect(ApplicationGenerator).to receive(:setup_coffee_files)
+        expect(ApplicationGenerator).to receive(:call_generator)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
       it 'sets up the bdd environment' do
-        expect(ApplicationGenerator).to receive(:setup_bdd_environment)
+        expect(ApplicationGenerator).to receive(:call_generator)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
       it 'sets up kuhsaft' do
-        expect(ApplicationGenerator).to receive(:setup_kuhsaft)
+        expect(ApplicationGenerator).to receive(:call_generator)
         ApplicationGenerator.shoestrap_generators('test_app', default_options)
       end
 
@@ -99,13 +116,13 @@ module Shoestrap
       it 'delegates to the Gem Install Generator' do
         Shell.stub(:exec)
         expect(GemInstallGenerator).to receive(:start)
-        ApplicationGenerator.install_gems([])
+        ApplicationGenerator.install_gems []
       end
 
       it 'delegates to the Gem Install Generator' do
         GemInstallGenerator.stub(:start)
         expect(Shell).to receive(:exec).with('bundle')
-        ApplicationGenerator.install_gems([])
+        ApplicationGenerator.install_gems []
       end
     end
 
@@ -113,35 +130,35 @@ module Shoestrap
       it 'runs the generator it was called with' do
         DummyGenerator = double
         expect(DummyGenerator).to receive('start')
-        ApplicationGenerator.setup_css_framework('dummy')
+        ApplicationGenerator.call_generator('dummy')
       end
     end
 
     describe '#setup_smacss_files' do
       it 'runs the smacss files generator' do
         expect(SmacssFilesGenerator).to receive('start')
-        ApplicationGenerator.setup_smacss_files
+        ApplicationGenerator.call_generator('smacss_files')
       end
     end
 
     describe '#setup_coffee_files' do
       it 'runs the coffee files generator' do
         expect(CoffeeFilesGenerator).to receive('start')
-        ApplicationGenerator.setup_coffee_files
+        ApplicationGenerator.call_generator('coffee_files')
       end
     end
 
     describe '#setup_bdd_environment' do
       it 'runs the rspec generator' do
         expect(BddGenerator).to receive('start')
-        ApplicationGenerator.setup_bdd_environment
+        ApplicationGenerator.call_generator('bdd')
       end
     end
 
     describe '#setup_kuhsaft' do
       it 'delegates to the Gem Install Generator' do
         expect(KuhsaftGenerator).to receive(:start)
-        ApplicationGenerator.setup_kuhsaft
+        ApplicationGenerator.call_generator('kuhsaft')
       end
     end
 

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ module Shoestrap
 end
 
 #
-# Use capture to silece and capture stderr/stdout
+# Use capture to silence and capture stderr/stdout
 # Useful to hide logged messages etc. in test run
 #
 def capture(*streams)

data/templates/application_generator/_typekit.html.haml

@@ -0,0 +1,4 @@
+- if Rails.application.config.typekit_key.present?
+  = javascript_include_tag "//use.typekit.net/#{Rails.application.config.typekit_key}.js", :media => 'all'
+  :javascript
+    try{Typekit.load();}catch(e){}

data/templates/application_generator/application.html.haml

@@ -1,15 +1,17 @@
 !!! 5
-/[if lt IE 7] <html class='no-js lt-ie9 lt-ie8 lt-ie7'>
-/[if IE 7] <html class='no-js lt-ie9 lt-ie8'>
-/[if IE 8] <html class='no-js lt-ie9'>
-/[if gt IE 8]><!
+/[if lt IE 7]
+  %html.no-js.lt-ie9.lt-ie8.lt-ie7{ lang: I18n.locale }
+/[if IE 7]
+  %html.no-js.lt-ie9.lt-ie8{ lang: I18n.locale }
+/[if IE 8]
+  %html.no-js.lt-ie9{ lang: I18n.locale }
+<!--[if gt IE 8]><!-->
 %html.no-js{ lang: I18n.locale }
-  / <![endif]
+  <!--<![endif]-->
   %head
-    %title= content_for?(:title) ? yield(:title) : 'Untitled'
-
     %meta{ charset: 'utf-8' }
     %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge,chrome=1' }
+    %title= content_for?(:title) ? yield(:title) : 'Untitled'
     %meta{ name: 'keywords', content: '' }
     %meta{ name: 'description', content: '' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0' }
@@ -22,9 +24,7 @@
     <![endif]-->
 
     -# Typekit
-    = javascript_include_tag '//use.typekit.net/XXXX.js', :media => 'all'
-    :javascript
-      try{Typekit.load();}catch(e){}
+    = render 'layouts/typekit'
 
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'modernizr', 'data-turbolinks-track' => true

data/templates/application_generator/application_template.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../../../lib/shoestrap/version', __FILE__)
+
 #
 # SC Rails Application Template
 #
@@ -13,6 +15,11 @@ application "config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '
 application "config.i18n.available_locales = [:de]"
 application "config.i18n.default_locale = :de"
 
+#
+# Miscellaneous
+#
+application "config.typekit_key = false"
+
 inject_into_file 'config/application.rb', :after => "Application < Rails::Application" do
   <<-eos
     # Customize generators
@@ -31,24 +38,32 @@ end
 #
 # Default Gems (others are added to gemfile by individual generators called after app generation)
 #
+gem 'therubyracer', platforms: :ruby
 gem 'simple_form', '3.0.0.rc'
 gem 'haml'
 gem 'haml-rails'
 gem 'simple-navigation'
 gem 'mail'
 gem 'fabrication'
-gem 'shoestrap'
-gem 'kuhsaft'
+gem 'inherited_resources'
+
+if ENV['SHOESTRAP_PATH']
+  gem 'shoestrap', path: ENV['SHOESTRAP_PATH']
+else
+  gem 'shoestrap', Shoestrap::VERSION
+end
+
 gem 'selectivizr-rails'
 gem 'modernizr-rails'
 gem 'bourbon'
 
 gem_group :development, :test do
   gem 'pry'
-  gem 'ruby_gntp'
+  gem 'terminal-notifier-guard'
   gem 'rspec-rails'
   gem 'guard-rspec'
   gem 'guard-spring'
+  gem 'mailcatcher'
 end
 
 gem_group :test do
@@ -60,6 +75,7 @@ end
 #
 remove_file "app/views/layouts/application.html.erb"
 copy_file "application.html.haml", "app/views/layouts/application.html.haml"
+copy_file '_typekit.html.haml', 'app/views/layouts/_typekit.html.haml' 
 
 #
 # Application helper