da-suspenders 1.0.3 → 1.1.0

data/features/support/env.rb

@@ -1 +0,0 @@
-require 'spec/expectations'

data/lib/create.rb

@@ -1,55 +1,57 @@
-# Methods needed to create a project.
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + "/errors")
-
-module DaSuspenders
-  class Create
-    attr_accessor :project_path
-
-    def self.run!(project_path)
-      creator = self.new(project_path)
-      creator.create_project!
-    end
-
-    def initialize(project_path)
-      self.project_path = project_path
-      validate_project_path
-      validate_project_name
-    end
-
-    def create_project!
-      exec(<<-COMMAND)
-        rails new #{project_path} \
-          --template="#{template}" \
-          --database=mysql \
-          --skip-test-unit \
-          --skip-prototype
-      COMMAND
-    end
-
-    private
-
-    def validate_project_name
-      project_name = File.basename(project_path)
-      unless project_name =~ /^[a-z0-9_]+$/
-        raise InvalidInput.new("Project name must only contain [a-z0-9_]")
-      end
-    end
-
-    def validate_project_path
-      base_directory = Dir.pwd
-      full_path = File.join(base_directory, project_path)
-
-      # This is for the common case for the user's convenience; the race
-      # condition can still occur.
-      if File.exists?(full_path)
-        raise InvalidInput.new("Project directory (#{project_path}) already exists")
-      end
-    end
-
-    def template
-      File.expand_path(File.dirname(__FILE__) + "/../template/da-suspenders.rb")
-    end
-  end
-end
+# Methods needed to create a project.
+
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + "/errors")
+
+module DaSuspenders
+  class Create
+    attr_accessor :project_path, :repo
+
+    def self.run!(project_path, repo)
+      creator = self.new(project_path, repo)
+      creator.create_project!
+    end
+
+    def initialize(project_path, repo)
+      self.project_path = project_path
+      self.repo = repo
+      validate_project_path
+      validate_project_name
+    end
+
+    def create_project!
+      command = <<-COMMAND
+        rails new #{project_path} \
+          --template="#{template}" \
+          --database=mysql \
+          --skip-test-unit
+      COMMAND
+      ENV["REPO"] = repo if repo
+      exec(command)
+    end
+
+    private
+
+    def validate_project_name
+      project_name = File.basename(project_path)
+      unless project_name =~ /^[a-z0-9_]+$/
+        raise InvalidInput.new("Project name must only contain [a-z0-9_]")
+      end
+    end
+
+    def validate_project_path
+      base_directory = Dir.pwd
+      full_path = File.join(base_directory, project_path)
+
+      # This is for the common case for the user's convenience; the race
+      # condition can still occur.
+      if File.exists?(full_path)
+        raise InvalidInput.new("Project directory (#{project_path}) already exists")
+      end
+    end
+
+    def template
+      File.expand_path(File.dirname(__FILE__) + "/../template/da-suspenders.rb")
+    end
+  end
+end

data/lib/da-suspenders/version.rb

@@ -1,3 +1,3 @@
-module DaSuspenders
-  VERSION = "1.0.3"
+module DaSuspenders
+  VERSION = "1.1.0"
 end

data/lib/errors.rb

@@ -1,12 +1,12 @@
-# User errors
-
-module DaSuspenders
-  class InvalidInput < Exception; end
-
-  module Errors
-    def error_with_message(msg)
-      STDERR.puts msg
-      exit 1
-    end
-  end
-end
+# User errors
+
+module DaSuspenders
+  class InvalidInput < Exception; end
+
+  module Errors
+    def error_with_message(msg)
+      STDERR.puts msg
+      exit 1
+    end
+  end
+end

data/template/da-suspenders.rb

@@ -1,173 +1,160 @@
-require "fileutils"
-require "pathname"
-require "trout"
-
-template_root = File.expand_path(File.join(File.dirname(__FILE__)))
-source_paths << File.join(template_root, "files")
-
-# Helpers
-
-def action_mailer_host(rails_env, host)
-  inject_into_file(
-    "config/environments/#{rails_env}.rb",
-    "\n\n  config.action_mailer.default_url_options = { :host => '#{host}' }",
-    :before => "\nend"
-  )
-end
-
-def origin
-  "git://github.com/die-antwort/da-suspenders.git"
-end
-
-def trout(destination_path)
-  parent = Pathname.new(destination_path).parent
-  FileUtils.mkdir_p(parent) unless File.exists?(parent) 
-  run "trout checkout --source-root=template/trout #{destination_path} #{origin}"
-end
-
-# Actions
-
-def create_gemfile_and_install_gems
-  say "Creating Gemfile and installing gems (this may take a while)", :yellow
-  trout "Gemfile"
-  run "bundle install"
-end
-  
-def add_staging_environment
-  say "Adding staging environment", :yellow
-  run "cp config/environments/production.rb config/environments/staging.rb"
-end
-
-def setup_action_mailer
-  say "Setting up action mailer config", :yellow
-  action_mailer_host "development", "localhost:3000"
-  action_mailer_host "test",        "example.com"
-  action_mailer_host "staging",     "#{app_name}.dev.die-antwort.eu"
-  action_mailer_host "production",  "FIXME"
-end
-
-def setup_database
-  say "Setting up database config", :yellow
-  template "mysql_database.yml.erb", "config/database.yml", :force => true
-  rake "db:create"
-end
-
-def setup_german_locale
-  say "Setting up german locale", :yellow
-  trout "config/locales/de.yml"
-  gsub_file 'config/application.rb', '# config.i18n.default_locale = :de', 'config.i18n.default_locale = :de'
-end
-
-def setup_viennese_timezone
-  say "Setting up viennese timezone", :yellow
-  gsub_file 'config/application.rb', "# config.time_zone = 'Central Time (US & Canada)'", "config.time_zone = 'Vienna'"
-end
-
-def disable_timestamped_migrations
-  say "Disabling timestamped migrations", :yellow
-  inject_into_class "config/application.rb", "Application", "\n    config.active_record.timestamped_migrations = false\n\n"
-end
-  
-def update_generators_config
-  say "Updating config for generators", :yellow
-  generators_config = <<-RUBY
-    config.generators do |generate|
-      generate.stylesheets false
-      generate.test_framework :rspec
-    end
-  RUBY
-  inject_into_class "config/application.rb", "Application", generators_config
-end
-
-def create_application_layout_and_views
-  say "Creating application layout and shared views", :yellow
-  trout "app/views/layouts/application.html.erb"
-  trout "app/views/shared/_flashes.html.erb"
-end
-
-def install_misc_support_files
-  say "Installing miscellaneous support files", :yellow
-  trout "config/initializers/errors.rb"
-  trout "app/helpers/body_class_helper.rb"
-end
-
-def install_app_config
-  say "Installing app_config", :yellow
-  generate "app_config:install staging"
-end
-
-def install_compass
-  say "Installing compass", :yellow
-  run "compass init rails . --sass-dir app/stylesheets --css-dir public/stylesheets -q"
-  inside 'app/stylesheets' do
-    remove_file 'ie.scss'
-    remove_file 'print.scss'
-    remove_file 'screen.scss'
-    empty_directory 'content'
-    empty_directory 'vendor'
-  end
-  trout "app/stylesheets/application.scss" 
-  trout "app/stylesheets/ie.scss" 
-end
-
-def install_formtastic
-  say "Installing formtastic", :yellow
-  generate "formtastic:install"
-  remove_file "public/stylesheets/formtastic.css"
-  remove_file "public/stylesheets/formtastic-changes.css"
-  trout "lib/templates/erb/scaffold/_form.html.erb"
-end
-
-def install_sprockets_and_jquery
-  say "Installing sprockets, jQuery, and some other javascripts", :yellow
-  plugin 'sprockets-rails', :git => 'git://github.com/gmoeck/sprockets-rails.git'
-  plugin 'jrails', :git => 'git://github.com/die-antwort/jrails.git'
-  route 'SprocketsApplication.routes(self)'
-  remove_dir 'public/javascripts'
-  remove_file "app/javascripts/application.js"
-  trout "app/javascripts/application.js"
-  trout "vendor/sprockets/modernizr/src/modernizr.js" 
-  trout "vendor/sprockets/jquery-ujs/src/rails.js" 
-end
-
-def install_rspec_and_cucumber
-  say "Installing rspec and cucumber", :yellow
-  generate "rspec:install"
-  generate "cucumber:install", "--rspec --capybara"
-  inject_into_file "features/support/env.rb",
-                   %{Capybara.save_and_open_page_path = "tmp"\n} +
-                   %{Capybara.javascript_driver = :akephalos\n},
-                   :before => %{Capybara.default_selector = :css}
-  inject_into_file "features/support/paths.rb",
-                   %{    when %r{"(/.*)?"}\n} +
-                   %{      $1\n\n},
-                   :before => "    else"
-  copy_file "factory_girl_steps.rb", "features/step_definitions/factory_girl_steps.rb"
-  trout "features/step_definitions/js_steps.rb"
-end
-
-def cleanup
-  say "Cleaning up", :yellow
-  remove_file 'README'
-  remove_file 'public/index.html'
-  remove_file 'public/images/rails.png'
-end
-
-create_gemfile_and_install_gems
-add_staging_environment
-setup_database
-setup_german_locale
-setup_viennese_timezone
-disable_timestamped_migrations
-update_generators_config
-create_application_layout_and_views
-install_misc_support_files
-install_app_config
-install_compass
-install_formtastic
-install_sprockets_and_jquery
-install_rspec_and_cucumber
-cleanup
-
-say "Rails app #{app_name} has been created successully!", :blue
+require "fileutils"
+require "pathname"
+require "trout"
+
+template_root = File.expand_path(File.join(File.dirname(__FILE__)))
+source_paths << File.join(template_root, "files")
+
+# Helpers
+
+def action_mailer_host(rails_env, host)
+  inject_into_file(
+    "config/environments/#{rails_env}.rb",
+    "\n\n  config.action_mailer.default_url_options = { :host => '#{host}' }",
+    :before => "\nend"
+  )
+end
+
+def origin
+  ENV["REPO"].presence || "git://github.com/die-antwort/da-suspenders.git"
+end
+
+def trout(destination_path)
+  parent = Pathname.new(destination_path).parent
+  FileUtils.mkdir_p(parent) unless File.exists?(parent) 
+  run "trout checkout --source-root=template/trout #{destination_path} #{origin}"
+end
+
+# Actions
+
+def create_gemfile_and_install_gems
+  say "Creating Gemfile and installing gems (this may take a while)", :yellow
+  trout "Gemfile"
+  run "bundle install"
+end
+  
+def add_staging_environment
+  say "Adding staging environment", :yellow
+  run "cp config/environments/production.rb config/environments/staging.rb"
+end
+
+def setup_action_mailer
+  say "Setting up action mailer config", :yellow
+  action_mailer_host "development", "localhost:3000"
+  action_mailer_host "test",        "example.com"
+  action_mailer_host "staging",     "#{app_name}.dev.die-antwort.eu"
+  action_mailer_host "production",  "FIXME"
+end
+
+def setup_database
+  say "Setting up database config", :yellow
+  template "mysql_database.yml.erb", "config/database.yml", :force => true
+  rake "db:create"
+end
+
+def setup_german_locale
+  say "Setting up german locale", :yellow
+  trout "config/locales/de.yml"
+  gsub_file 'config/application.rb', '# config.i18n.default_locale = :de', 'config.i18n.default_locale = :de'
+end
+
+def setup_viennese_timezone
+  say "Setting up viennese timezone", :yellow
+  gsub_file 'config/application.rb', "# config.time_zone = 'Central Time (US & Canada)'", "config.time_zone = 'Vienna'"
+end
+
+def disable_timestamped_migrations
+  say "Disabling timestamped migrations", :yellow
+  inject_into_class "config/application.rb", "Application", "\n    config.active_record.timestamped_migrations = false\n\n"
+end
+  
+def update_generators_config
+  say "Updating config for generators", :yellow
+  generators_config = <<-RUBY
+    config.generators do |generate|
+      generate.stylesheets false
+      generate.test_framework :rspec
+    end
+  RUBY
+  inject_into_class "config/application.rb", "Application", generators_config
+end
+
+def create_application_layout_and_views
+  say "Creating application layout and shared views", :yellow
+  trout "app/views/layouts/application.html.erb"
+  trout "app/views/shared/_flashes.html.erb"
+end
+
+def install_misc_support_files
+  say "Installing miscellaneous support files", :yellow
+  trout "config/initializers/errors.rb"
+  trout "app/helpers/body_class_helper.rb"
+end
+
+def install_app_config
+  say "Installing app_config", :yellow
+  generate "app_config:install staging"
+end
+
+def install_compass
+  say "Installing compass", :yellow
+  remove_file "app/assets/stylesheets/application.css"
+  trout "app/assets/stylesheets/application.css.scss"
+  trout "app/assets/stylesheets/ie6.css.scss"
+  trout "app/assets/stylesheets/ie7.css.scss"
+end
+
+def install_formtastic
+  say "Installing formtastic", :yellow
+  generate "formtastic:install"
+end
+
+def install_javascripts
+  say "Installing application.js.coffee, modernizr and jquery-ui", :yellow
+  remove_file "app/assets/javascripts/application.js"
+  trout "app/assets/javascripts/application.js.coffee"
+  trout "vendor/assets/javascripts/modernizr.js" 
+  trout "vendor/assets/javascripts/jquery-ui-1.8.16.js" 
+end
+
+def install_rspec_and_cucumber
+  say "Installing rspec and cucumber", :yellow
+  generate "rspec:install"
+  generate "cucumber:install", "--rspec --capybara"
+  inject_into_file "features/support/env.rb",
+                   %{Capybara.save_and_open_page_path = "tmp"\n} +
+                   %{Capybara.javascript_driver = :akephalos\n},
+                   :before => %{Capybara.default_selector = :css}
+  inject_into_file "features/support/paths.rb",
+                   %{    when %r{"(/.*)?"}\n} +
+                   %{      $1\n\n},
+                   :before => "    else"
+  copy_file "factory_girl_steps.rb", "features/step_definitions/factory_girl_steps.rb"
+  trout "features/step_definitions/js_steps.rb"
+end
+
+def cleanup
+  say "Cleaning up", :yellow
+  remove_file 'README'
+  remove_file 'public/index.html'
+  remove_file 'public/images/rails.png'
+end
+
+create_gemfile_and_install_gems
+add_staging_environment
+setup_database
+setup_german_locale
+setup_viennese_timezone
+disable_timestamped_migrations
+update_generators_config
+create_application_layout_and_views
+install_misc_support_files
+install_app_config
+install_compass
+install_formtastic
+install_javascripts
+install_rspec_and_cucumber
+cleanup
+
+say "Rails app #{app_name} has been created successully!", :blue
 say "Remember to run 'rails generate hoptoad' with your API key.", :blue