rough_draft 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09997bba0ca980cb909fd7dd485b4e795541bf2
-  data.tar.gz: d4ff2645264ca60db7a9912afbd27184b8611bff
+  metadata.gz: df405e5e1c9afb4eac866848c0879e98680955c7
+  data.tar.gz: 806505cf70909e816098813f4f990bb972af4234
 SHA512:
-  metadata.gz: 927607fa82f8eabb18743c62b3261075b3ce1750ac77fed9ecd5a0c76e833602d54d2f8e7ec70083eedc825a4778d645d86c3807ddcfb5fbee7a215b117b5316
-  data.tar.gz: ae4942594576a02fa1036a86c45840ee153bf6afcdd3f5256040543d9ab8981d5f9b23d5bbdf4b049fda6e4b80c33cde0b1599cf4326975a0e9bbbc136d63de3
+  metadata.gz: 41f64d6e2b7610748a40b1569707aa22040e838da3579130b60facc4e1574796d27f94146cbe338ab93a2d94208a45c94ed85a699995620fafb252a2c8cd1f1a
+  data.tar.gz: 0bd1be04e349f3572abd1c7fc704eebad488b44481acb322f1fb0fa6074c181eeba68e088da9631bfb73e43d8c3a263eef5e638e76bf1a6a9488e28888240a83

data/bin/rough_draft

@@ -1,14 +1,40 @@
 #!/usr/bin/env ruby
 require 'pathname'
 
-source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
-$LOAD_PATH << source_path
+gem_root    = (Pathname.new(__FILE__).dirname + '..').expand_path
+code_root   = gem_root + 'lib'
+source_root = gem_root + 'source'
+
+$LOAD_PATH << code_root
 
 require 'rough_draft'
 
-source_root = File.expand_path(File.join('..', 'source'), File.dirname(__FILE__))
+VALID_ROUGH_DRAFT_RESOURCES = %w{rails engine}
+
+if VALID_ROUGH_DRAFT_RESOURCES.include?(ARGV.first)
+  product         = ARGV.shift.titleize
+  class_name      = "RoughDraft::#{product}Generator"
+  generator_class = class_name.constantize
+
+  generator_class.source_root source_root
+  generator_class.source_paths << Rails::Generators::AppGenerator.source_root << source_root
+
+  generator_class.start
+else
+  usage = <<-USAGE
+
+This command generates resources which comply with our default styles and
+usage guidelines.
+
+Commands:
+  rails <app_name>     - Generate a new Rails app
+  engine <engine_name> - Generate a new Rails engine
+
+Options:
+  heroku               - Generate an app for Staging and Production on Heroku
+  github=<repo_name>   - Generate a repo named 'repo_name' on Github
 
-RoughDraft::AppGenerator.source_root source_root
-RoughDraft::AppGenerator.source_paths << Rails::Generators::AppGenerator.source_root << source_root
+  USAGE
 
-RoughDraft::AppGenerator.start
+  puts usage
+end

data/lib/rough_draft/{app_builder.rb → rails_builder.rb}

@@ -2,7 +2,7 @@ require 'rails/generators/rails/app/app_generator'
 require 'rough_draft/actions'
 
 module  RoughDraft
-class   AppBuilder < Rails::AppBuilder
+class   RailsBuilder < Rails::AppBuilder
   include RoughDraft::Actions
 
   def readme
@@ -56,7 +56,8 @@ class   AppBuilder < Rails::AppBuilder
       super
     end
 
-    copy_file "#{destination_root}/config/database.yml", 'config/database-example.yml'
+    copy_file         "#{destination_root}/config/database.yml",  'config/database-example.yml'
+    copy_source_file  'config/database-travis.yml'
   end
 
   def db
@@ -77,6 +78,7 @@ class   AppBuilder < Rails::AppBuilder
     git               :checkout => 'master --quiet'
     git               :merge    => '--no-ff rough-draft --quiet --no-edit'
     git               :branch   => '-D rough-draft --quiet'
+    git               :push     => 'origin master'
   end
 
   def ruby_version
@@ -127,6 +129,12 @@ class   AppBuilder < Rails::AppBuilder
     git_commit                      'Generate setup script'
   end
 
+  def rubocop
+    copy_file                       'rubocop.yml', '.rubocop.yml'
+
+    git_commit                      'Configure Rubocop'
+  end
+
   def disable_generators
     config = <<-RUBY
     config.generators do |generate|
@@ -167,6 +175,7 @@ class   AppBuilder < Rails::AppBuilder
   end
 
   def travis
+    run                             'travis enable'
     template                        'travis.yml.erb', '.travis.yml'
 
     git_commit                      'Setup Travis CI'
@@ -358,6 +367,9 @@ skylight:
 
   def github_repo(repo_name)
     run                             "hub create #{repo_name}"
+    git                             remote: 'remove origin'
+    git                             remote: "add -t master origin git@github.com:#{repo_name}.git"
+    git                             push:   "--quiet --set-upstream origin master"
   end
 
   def heroku_specific_gems
@@ -368,25 +380,28 @@ skylight:
   end
 
   def heroku_apps
-    valid_heroku_app_name=app_name.gsub(/_/, '-')
+    run "heroku create #{heroku_production_app_name} --remote=production"
+    run "heroku create #{heroku_staging_app_name} --remote=staging"
+    run "heroku config:add RACK_ENV=staging RAILS_ENV=staging --app=#{heroku_staging_app_name} --remote=staging"
+  end
 
-    run "heroku create #{valid_heroku_app_name}-production --remote=production"
-    run "heroku create #{valid_heroku_app_name}-staging --remote=staging"
-    run "heroku config:add RACK_ENV=staging RAILS_ENV=staging --app=#{valid_heroku_app_name}-staging --remote=staging"
+  def heroku_config
+    template                        'config/settings/heroku.yml.erb', 'config/settings/heroku.yml'
   end
 
   def heroku_remotes
-    valid_heroku_app_name=app_name.gsub(/_/, '-')
-
     remotes = <<-RUBY
 
 # Set up staging and production git remotes
-git remote add staging git@heroku.com:#{valid_heroku_app_name}-staging.git
-git remote add production git@heroku.com:#{valid_heroku_app_name}-production.git
+git remote add staging git@heroku.com:#{heroku_staging_app_name}.git
+git remote add production git@heroku.com:#{heroku_production_app_name}.git
     RUBY
 
     append_file                     'bin/setup', remotes
 
+    git remote: "add staging git@heroku.com:#{heroku_staging_app_name}.git"
+    git remote: "add production git@heroku.com:#{heroku_production_app_name}.git"
+
     git_commit                      'Add staging and production remotes to setup script'
   end
 
@@ -399,6 +414,7 @@ git remote add production git@heroku.com:#{valid_heroku_app_name}-production.git
 
   def secure_configuration_settings
     run                             "cd #{destination_root} && chamber secure"
+    run                             "cd #{destination_root} && chamber travis secure" if github_enabled?
 
     git_commit                      'Add all configuration settings', :include_settings => true
   end

data/lib/rough_draft/{app_generator.rb → rails_generator.rb}

@@ -1,9 +1,9 @@
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
-require 'rough_draft/app_builder'
+require 'rough_draft/rails_builder'
 
 module  RoughDraft
-class   AppGenerator < Rails::Generators::AppGenerator
+class   RailsGenerator < Rails::Generators::AppGenerator
   class_option :database,       :type     => :string,
                                 :aliases  => '-d',
                                 :default  => 'postgresql',
@@ -14,6 +14,14 @@ class   AppGenerator < Rails::Generators::AppGenerator
                                 :default  => false,
                                 :desc     => 'Create staging and production Heroku apps'
 
+  class_option :slack,          :type     => :string,
+                                :default  => nil,
+                                :desc     => 'The Slack room identifier where CI notifications should be posted'
+
+  class_option :bugsnag,        :type     => :string,
+                                :default  => nil,
+                                :desc     => 'The API key used for integrating the app with BugSnag'
+
   class_option :skip_test_unit, :type     => :boolean,
                                 :aliases  => '-T',
                                 :default  => true,
@@ -43,11 +51,11 @@ class   AppGenerator < Rails::Generators::AppGenerator
     build :raise_on_unpermitted_parameters
     build :setup_script
     build :disable_generators
+    build :rubocop
 
     # Test
     build :rspec
     build :factories
-    build :travis
 
     # Production
     build :rack_deflator
@@ -74,9 +82,6 @@ class   AppGenerator < Rails::Generators::AppGenerator
     build :unicorn
     build :foreman
     build :mail_safe
-    build :skylight
-    build :code_climate
-    build :bugsnag
 
     # Database
     build :database_seeding
@@ -97,9 +102,16 @@ class   AppGenerator < Rails::Generators::AppGenerator
     if options[:heroku]
       build :heroku_specific_gems
       build :heroku_apps
+      build :heroku_config
       build :heroku_remotes
     end
 
+    # Integrations
+    build :bugsnag            if bugsnag_api_key.present?
+    build :skylight
+    build :code_climate       if options[:github]
+    build :travis             if options[:github]
+
     # Security
     build :secret_token
     build :secure_configuration_settings
@@ -116,22 +128,50 @@ class   AppGenerator < Rails::Generators::AppGenerator
 
   private
 
+  def heroku_enabled?
+    options[:heroku]
+  end
+
+  def github_enabled?
+    options[:github]
+  end
+
+  def heroku_base_app_name
+    app_name.gsub(/_/, '-')
+  end
+
+  def heroku_production_app_name
+    "#{heroku_base_app_name}-production"
+  end
+
+  def heroku_staging_app_name
+    "#{heroku_base_app_name}-staging"
+  end
+
   def slack_room
-    @@slack_room ||= ask "What is the Slack room you would like CI notifications posted to?"
+    @@slack_room ||= options[:slack]
   end
 
   def code_climate_repo_token
-    @@code_climate_repo_token ||= ask "What is the repo token for this app on Code Climate?"
+    if !defined?(@@code_climate_repo_token) || @@code_climate_repo_token.nil?
+      say "Visit codeclimate.com and set up the integration for #{options[:github]}."
+      say "When you're done, find the CODECLIMATE_REPO_TOKEN on the code coverage settings page."
+      say ""
+
+      @@code_climate_repo_token = ask "Enter it here:"
+    else
+      @@code_climate_repo_token
+    end
   end
 
   def bugsnag_api_key
-    @@bugsnag_api_key ||= ask "What is the API key for this app on BugSnag?"
+    @@bugsnag_api_key ||= options[:bugsnag]
   end
 
   protected
 
   def get_builder_class
-    RoughDraft::AppBuilder
+    RoughDraft::RailsBuilder
   end
 end
 end

data/lib/rough_draft/version.rb

@@ -1,3 +1,3 @@
 module RoughDraft
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/rough_draft.rb

@@ -1,2 +1,2 @@
 require 'rough_draft/version'
-require 'rough_draft/app_generator'
+require 'rough_draft/rails_generator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rough_draft
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - jfelchner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,8 +39,8 @@ files:
 - bin/rough_draft
 - lib/rough_draft.rb
 - lib/rough_draft/actions.rb
-- lib/rough_draft/app_builder.rb
-- lib/rough_draft/app_generator.rb
+- lib/rough_draft/rails_builder.rb
+- lib/rough_draft/rails_generator.rb
 - lib/rough_draft/version.rb
 homepage: https://github.com/thekompanee/blueprints/rails
 licenses: []