appscrolls 0.7.1 → 0.8.0

data/.travis.yml

@@ -1,6 +1,10 @@
+script: bundle exec rake
+language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
-  - jruby
-  - rbx
-  - ree
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+notifications:
+  recipients:
+    - drnicwilliams@gmail.com

data/ChangeLog.md

@@ -1,5 +1,14 @@
 # ChangeLog
 
+## v0.8
+
+* `postgresql` - supported on `eycloud` (Currently PostgreSQL 9.1)
+* `eycloud` - can boot clusters, in addition to solos
+* `mysql` - always generates `sample.rake`
+* bin/scrolls is short-form of bin/appscrolls
+* `puma` & `thin` - moved into zzz archive until Puma is released on EY Cloud; or another supporting platform added
+* `spork` - moved into zzz archive as part of simplification
+
 ## v0.7
 
 New name! "App Scrolls"

data/README.md

@@ -11,6 +11,7 @@
 The App Scrolls is a magical tool to generate new Rails and modify existing Rails applications (coming) to include your favourite, powerful magic. Authentication, testing, persistence, javascript, css, deployment, and templating - there's a magical scroll for you.
 
 * Follow on twitter [@appscrolls][9]
+* [![Build Status](https://secure.travis-ci.org/drnic/appscrolls.png?branch=master)](http://travis-ci.org/drnic/appscrolls)
 
 An example application that was built by the App Scrolls is at [https://github.com/drnic/mydemoapp][14]. The generated README shows all the scrolls that were included.
 
@@ -25,17 +26,32 @@ Installation is simple:
 The primary usage of the `appscrolls` gem is to utilize its interactive terminal command to build a new Rails application. To get started, you can simply run the command thusly:
 
     appscrolls new APP_NAME
+    scrolls new APP_NAME
 
 Where `APP_NAME` is the directory in which you wish to create the app (it mirrors the Rails creation syntax). You will then be guided through the scroll selection process and subsequently the Rails app generator will automatically run with the template and all appropriate command line options included.
 
 To transform an existing Rails app, you ... wait, that's not implemented yet. But since the "apply template" feature of `rails new APP_NAME -m template.rb` is implemented in Thor, I mean, how hard could it be?*
 
+### Available Scrolls
+
+The current available scrolls grouped by category:
+
+* administration: active_admin
+* assets: jquery, prototype
+* deployment: eycloud, eycloud_recipes_on_deploy, git, github, passenger, thin, unicorn
+* persistence: mysql, postgresql, redis, sqlite3
+* stylesheet: twitter_bootstrap
+* templating: simple_form
+* testing: capybara, cucumber, rspec, test_unit
+* worker: delayed_job, resque
+* other: env_yaml, guard, rails_basics, split
+
 ### Specifying Scrolls
 
 If you wish to skip the interactive scroll selector, you may provide instead a list of scrolls with the `-s` or `--scrolls` option:
 
-    appscrolls new APP_NAME -s twitter_bootstrap mysql resque
-    appscrolls new APP_NAME --scrolls postgresql github eycloud
+    scrolls new APP_NAME -s twitter_bootstrap mysql resque
+    scrolls new APP_NAME --scrolls postgresql github eycloud
 
 This will automatically generate a Rails template with the provided scrolls and begin the app generator.
 
@@ -43,11 +59,11 @@ This will automatically generate a Rails template with the provided scrolls and
 
 You can also print out a simple list of scrolls:
 
-    appscrolls list
+    scrolls list
 
 Or print out a list of scrolls for a specific category:
 
-    appscrolls list persistence
+    scrolls list persistence
 
 ## Deployment Support
 

data/bin/scrolls

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$:.push File.dirname(__FILE__) + '/../lib'
+
+require 'rubygems'
+require 'appscrolls/command'
+
+AppScrollsScrolls::Command.start

data/scrolls/eycloud.rb

@@ -1,8 +1,8 @@
 @name = File.basename(File.expand_path("."))
 
 gem_group :development do
-  gem 'ey_cli'
-  gem 'engineyard'
+  gem 'ey_cli', '>= 0.3.0'
+  gem 'engineyard', '>= 1.4.28'
 end
 
 gem 'ey_config' # for partner services
@@ -10,13 +10,13 @@ gem 'ey_config' # for partner services
 required_dbs = %w[mysql postgresql]
 required_app_servers = %w[unicorn trinidad passenger puma thin]
 
-selected_db = required_dbs.find {|db| scroll? db }
+selected_db = required_dbs.find { |db| scroll? db }
 unless selected_db
   say_custom "eycloud", "Please include a DB choice from: #{required_dbs.join ", "}"
   exit_now = true
 end
 
-selected_app_server = required_app_servers.find {|app| scroll? app }
+selected_app_server = required_app_servers.find { |app| scroll? app }
 unless selected_app_server
   say_custom "eycloud", "Please include an App Server choice from: #{required_app_servers.join ", "}"
   exit_now = true
@@ -31,13 +31,10 @@ after_everything do
   else
     run "ey login"
 
-    if @mysql_stack
-      say_custom "eycloud", "Using mysql #{@mysql_stack}"
-    elsif @postgresql_stack
-      say_custom "eycloud", "Using postgresql #{@postgresql_stack}"
-    end
-  
-    framework_env = multiple_choice "Which framework environment?", [%w[Production production], %w[Staging staging]]
+    framework_env = multiple_choice "Which framework environment?", [
+      ['Production', 'production'],
+      ['Staging (solo environment only)', 'staging']
+    ]
 
     # TODO check for app name first
     app_name = (@repo_name && @repo_name.size > 0) ? @repo_name : @name
@@ -46,6 +43,18 @@ after_everything do
     while @app_names.include?(app_name)
       app_name = ask_wizard "Application #{app_name} is already exists. What name?"
     end
+    
+    if framework_env == "production"
+      say_custom "eycloud", "All configurations use High-CPU VM worth $170/mth each."
+      say_custom "eycloud", "Process numbers below are estimates."
+      cluster_config = multiple_choice "Select application cluster configuration?", [
+        ['Basic - 5 CPU-based processes (1 VM) & DB Master VM', 'basic'],
+        ['Pro   - 15 CPU-based highly-available processes (3 VMs) & DB Master VM', 'ha'],
+        ['Solo  - 1 VM for app processes, DB and other services', 'solo']
+      ]
+    else
+      say_custom "eycloud", "Defaulting to single/solo High-CPU medium instance for staging environment"
+    end
 
     name = File.basename(".")
     command = "bundle exec ey_cli create_app --name #{app_name} --type rails3 "
@@ -53,7 +62,16 @@ after_everything do
     command += "--framework_env #{framework_env} "
     command += "--env_name #{@name}_#{framework_env} "
     command += "--stack #{selected_app_server} "
-    command += "--solo"
+    command += "--db_stack #{selected_db} " if selected_db
+    case cluster_config.to_sym
+    when :basic
+      command += "--app_instances 1 "
+    when :ha
+      command += "--app_instances 3 "
+    when :solo
+      command += "--solo "
+    end
+      
     run command
 
   end

data/scrolls/mysql.rb

@@ -1,29 +1,22 @@
 gem "mysql2"
 
-# TODO what about Windows?
-
-# if scroll?("eycloud")
-#   mysql_versions = [
-#     ["MySQL 5.0", "mysql_50"],
-#     ["MySQL 5.5 (beta)", "mysql_55"]
-#   ]
-#   @mysql_stack = multiple_choice("Create app to which Engine Yard Cloud account?", mysql_versions)
-# end
+if scroll?("eycloud")
+  @db_stack = "mysql"
+end
 
 after_bundler do
   rake "db:create:all" if config['auto_create']
   
-  if config['populate_rake_task']
-    sample_rake = <<-RUBY
-require './config/environment'
+  rakefile("sample.rake") do
+<<-RUBY
 namespace :db do
   desc "Populate the database with sample data"
-  task :sample do
+  task :sample => :environment do
+    
   end
   task :populate => :sample
 end
 RUBY
-    File.open("lib/tasks/sample.rake", 'w') {|f| f.write(sample_rake)}
   end
 end
 
@@ -43,9 +36,4 @@ args: -d mysql
 config:
   - auto_create:
       type: boolean
-      prompt: "Create MySQL database with default configuration?"
-
-  - populate_rake_task:
-      type: boolean
-      prompt: "Add db:sample rake task?"
-
+      prompt: "Create local MySQL databases with default configuration?"

data/scrolls/postgresql.rb

@@ -1,26 +1,25 @@
 gem "pg"
 
 gsub_file "config/database.yml", /username: .*/, "username: #{config['pg_username']}"
-gsub_file "config/database.yml", /password: .*/, "username: #{config['pg_password']}"
+gsub_file "config/database.yml", /password: .*/, "password: #{config['pg_password']}"
 
-# if scroll?("eycloud")
-#   @db_stack = "postgresql_91"
-# end
+if scroll?("eycloud")
+  @db_stack = "postgresql"
+end
 
 after_bundler do
   rake "db:create:all" if config['auto_create']
   
-  if config['populate_rake_task']
-    sample_rake = <<-RUBY
-require './config/environment'
+  rakefile("sample.rake") do
+<<-RUBY
 namespace :db do
   desc "Populate the database with sample data"
-  task :sample do
+  task :sample => :environment do
+
   end
   task :populate => :sample
 end
 RUBY
-    File.open("lib/tasks/sample.rake", 'w') {|f| f.write(sample_rake)}
   end
 end
 
@@ -40,11 +39,7 @@ args: -d postgresql
 config:
   - auto_create:
       type: boolean
-      prompt: "Create PostgreSQL database with default configuration?"
-
-  - populate_rake_task:
-      type: boolean
-      prompt: "Add db:sample rake task?"
+      prompt: "Create local PostgreSQL databases with default configuration?"
 
   - pg_username:
       type: string

data/version.rb

@@ -1,3 +1,3 @@
 module AppScrollsScrolls
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscrolls
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70325815885200 !ruby/object:Gem::Requirement
+  requirement: &70196379709560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70325815885200
+  version_requirements: *70196379709560
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70325815883940 !ruby/object:Gem::Requirement
+  requirement: &70196379708380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325815883940
+  version_requirements: *70196379708380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70325813090120 !ruby/object:Gem::Requirement
+  requirement: &70196379706120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70325813090120
+  version_requirements: *70196379706120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70325813087820 !ruby/object:Gem::Requirement
+  requirement: &70196379726380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325813087820
+  version_requirements: *70196379726380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70325813083840 !ruby/object:Gem::Requirement
+  requirement: &70196379720980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325813083840
+  version_requirements: *70196379720980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325813082980 !ruby/object:Gem::Requirement
+  requirement: &70196379735760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70325813082980
+  version_requirements: *70196379735760
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70325815911220 !ruby/object:Gem::Requirement
+  requirement: &70196379733280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325815911220
+  version_requirements: *70196379733280
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70325815906900 !ruby/object:Gem::Requirement
+  requirement: &70196379730960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325815906900
+  version_requirements: *70196379730960
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70325815919760 !ruby/object:Gem::Requirement
+  requirement: &70196379728900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325815919760
+  version_requirements: *70196379728900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70325815916760 !ruby/object:Gem::Requirement
+  requirement: &70196379755440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70325815916760
+  version_requirements: *70196379755440
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70325815914860 !ruby/object:Gem::Requirement
+  requirement: &70196379754620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325815914860
+  version_requirements: *70196379754620
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70325815926660 !ruby/object:Gem::Requirement
+  requirement: &70196379753920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70325815926660
+  version_requirements: *70196379753920
 description: ! 'The App Scrolls is a magical tool to generate new Rails and modify
   existing Rails applications (coming) to include your favourite, powerful magic. '
 email:
@@ -151,6 +151,7 @@ email:
 - drnicwilliams@gmail.com
 executables:
 - appscrolls
+- scrolls
 extensions: []
 extra_rdoc_files: []
 files:
@@ -165,6 +166,7 @@ files:
 - Rakefile
 - appscrolls.gemspec
 - bin/appscrolls
+- bin/scrolls
 - features/step_definitions/common_steps.rb
 - features/support/common.rb
 - features/support/env.rb
@@ -193,17 +195,14 @@ files:
 - scrolls/passenger.rb
 - scrolls/postgresql.rb
 - scrolls/prototype.rb
-- scrolls/puma.rb
 - scrolls/rails_basics.rb
 - scrolls/redis.rb
 - scrolls/resque.rb
 - scrolls/rspec.rb
 - scrolls/simple_form.rb
 - scrolls/split.rb
-- scrolls/spork.rb
 - scrolls/sqlite3.rb
 - scrolls/test_unit.rb
-- scrolls/thin.rb
 - scrolls/twitter_bootstrap.rb
 - scrolls/unicorn.rb
 - scrolls/zzz/activerecord.rb
@@ -236,6 +235,7 @@ files:
 - scrolls/zzz/omniauth.rb
 - scrolls/zzz/paper_trail.rb
 - scrolls/zzz/pow.rb
+- scrolls/zzz/puma.rb
 - scrolls/zzz/rails_admin.rb
 - scrolls/zzz/rails_dev_tweaks.rb
 - scrolls/zzz/rails_erd.rb
@@ -248,6 +248,8 @@ files:
 - scrolls/zzz/shoulda_matchers.rb
 - scrolls/zzz/sidekiq.rb
 - scrolls/zzz/slim.rb
+- scrolls/zzz/spork.rb
+- scrolls/zzz/thin.rb
 - scrolls/zzz/thinking_sphinx.rb
 - scrolls/zzz/vanity.rb
 - spec/appscrolls/config_spec.rb
@@ -277,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3316206599219771388
+      hash: 703188970612526833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -286,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3316206599219771388
+      hash: 703188970612526833
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17