appscrolls 0.8.0 → 0.8.1

data/ChangeLog.md

@@ -1,5 +1,6 @@
 # ChangeLog
 
+
 ## v0.8
 
 * `postgresql` - supported on `eycloud` (Currently PostgreSQL 9.1)
@@ -9,6 +10,14 @@
 * `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.8.1
+
+* `twitter_bootstrap` - includes `rails_basics`
+* `eycloud` - only using `ey_cli` (`engineyard` gem has `net-ssh` conflict with `chef` gem)
+* Display scrolls that will be used - explicitly requested (green) and implicitly included (yellow)
+* `eycloud` - only unicorn and passenger initially supported
+* `eycloud` - don't check for available app name - this should be implemented in ey_cli
+
 ## v0.7
 
 New name! "App Scrolls"

data/README.md

@@ -73,12 +73,28 @@ Web applications are boring if they aren't running proudly on the internet. The
 
 Scroll: `eycloud`
 
-If you choose the `eycloud` scroll, your application will be automatically deployed to [Engine Yard Cloud][6]. Your code will also be automatically stored on a private/public GitHub repository.
+Example:
 
-The `eycloud` scroll magically transforms many other scrolls to work specifically for [Engine Yard Cloud][6]. For example:
+```
+scrolls new mydemoapp -s twitter_bootstrap unicorn postgresql resque github eycloud
+```
+
+The created application above will be automatically stored in a git private/public repository on GitHub and then deployed to [Engine Yard Cloud][6].
+
+When deploying to [Engine Yard Cloud][6] you will need to choose:
+
+* `unicorn` or `passenger` for your app server
+* `mysql` or `postgresql` for your SQL DB
+
+When choosing from the following scrolls, your Engine Yard Cloud environment will be automatically upgraded/configured with Chef recipes. 
+
+* `resque` - add utility instances called `resque` for workers [see [readme][15] for more information]
+* `redis` - add a utility called `redis` to have a dedicated redis DB; else it is run on your DB master or Solo instance
+* `delayed_job` - add utility instances called `delayed_job` or `dj` for workers [see [readme][16] for more information]
+
+Note: Resque is recommended instead of Delayed Job. Soon, Sidekiq will be recommended over both, and 
 
-* `postgresql` - the environment will have PostgreSQL selected instead of MySQL
-* `resque` - the environment will have Resque and Redis
+Please open an Issue if you want an alternate option (`puma` or `thin`; or `mongodb`)
 
 ### Heroku
 
@@ -167,4 +183,6 @@ App Scrolls and its scrolls are distributed under the MIT License. See [MIT_LICE
 [11]:https://github.com/drnic/appscrolls/tree/master/scrolls
 [12]:https://github.com/drnic/appscrolls/tree/master/scrolls/zzz
 [13]:https://github.com/drnic/appscrolls/tree/apply_scrolls
-[14]:https://github.com/drnic/mydemoapp
+[14]:https://github.com/drnic/mydemoapp
+[15]:https://github.com/engineyard/eycloud-recipe-resque#readme
+[16]:https://github.com/engineyard/eycloud-recipe-delayed_job#readme

data/lib/appscrolls/command.rb

@@ -65,10 +65,18 @@ module AppScrollsScrolls
       def run_template(name, scrolls, display_only = false)
         puts
         puts
-        puts "#{bold}Generating and Running Template..."
+        puts "#{bold}Generating and Running Template...#{clear}"
         puts
         file = Tempfile.new('template')        
         template = AppScrollsScrolls::Template.new(scrolls)
+
+        puts "Using the following scrolls:"
+        template.resolve_scrolls.map do |scroll|
+          color = scrolls.include?(scroll.new.key) ? green : yellow # yellow - automatic dependency
+          puts "  #{color}* #{scroll.new.name}#{clear}"
+        end
+        puts
+
         file.write template.compile
         file.close
         if display_only

data/scrolls/eycloud.rb

@@ -2,13 +2,12 @@
 
 gem_group :development do
   gem 'ey_cli', '>= 0.3.0'
-  gem 'engineyard', '>= 1.4.28'
 end
 
 gem 'ey_config' # for partner services
 
 required_dbs = %w[mysql postgresql]
-required_app_servers = %w[unicorn trinidad passenger puma thin]
+required_app_servers = %w[unicorn passenger] # TODO trinidad puma thin
 
 selected_db = required_dbs.find { |db| scroll? db }
 unless selected_db
@@ -29,8 +28,6 @@ after_everything do
   if @git_url.size == 0
     say_custom "eycloud", "Skipping... no git URI discovered"
   else
-    run "ey login"
-
     framework_env = multiple_choice "Which framework environment?", [
       ['Production', 'production'],
       ['Staging (solo environment only)', 'staging']
@@ -38,18 +35,18 @@ after_everything do
 
     # TODO check for app name first
     app_name = (@repo_name && @repo_name.size > 0) ? @repo_name : @name
-    say_custom "eycloud", "Checking for availability of #{app_name}"
-    @app_names ||= `bundle exec ey_cli apps | grep "-" | sed "s/.* //"`.split(/\n/)
-    while @app_names.include?(app_name)
-      app_name = ask_wizard "Application #{app_name} is already exists. What name?"
-    end
+    # say_custom "eycloud", "Checking for availability of #{app_name}"
+    # @app_names ||= `bundle exec ey_cli apps | grep "-" | sed "s/.* //"`.split(/\n/)
+    # 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'],
+        ['Basic - 1 app VM (5 CPU-based processes) & DB Master VM', 'basic'],
+        ['Pro   - 3 app highly-available VMs (15 CPU-based processes) & DB Master VM', 'ha'],
         ['Solo  - 1 VM for app processes, DB and other services', 'solo']
       ]
     else
@@ -58,6 +55,7 @@ after_everything do
 
     name = File.basename(".")
     command = "bundle exec ey_cli create_app --name #{app_name} --type rails3 "
+    # command += "--account #{account_name} " if account_name
     command += "--git #{@git_url} "
     command += "--framework_env #{framework_env} "
     command += "--env_name #{@name}_#{framework_env} "

data/scrolls/github.rb

@@ -1,6 +1,8 @@
 gem 'github', '>= 0.7.0', :require => nil, :group => [:development]
 
 after_everything do
+  github_private = multiple_choice "Create a GitHub repository?", [["Public", false], ["Private", true]]
+  
   tried_create_already = false
   while (@git_uri = `git config remote.origin.url`.strip) && @git_uri.size == 0
     if tried_create_already
@@ -30,9 +32,3 @@ exclusive: scm-hosting
 
 requires: [git]
 run_after: [git]
-
-config:
-  - github_private:
-      prompt: "Create a GitHub repository?"
-      type: multiple_choice
-      choices: [["Public", false], ["Private", true]]

data/scrolls/mysql.rb

@@ -1,9 +1,5 @@
 gem "mysql2"
 
-if scroll?("eycloud")
-  @db_stack = "mysql"
-end
-
 after_bundler do
   rake "db:create:all" if config['auto_create']
   

data/scrolls/postgresql.rb

@@ -3,12 +3,8 @@ gem "pg"
 gsub_file "config/database.yml", /username: .*/, "username: #{config['pg_username']}"
 gsub_file "config/database.yml", /password: .*/, "password: #{config['pg_password']}"
 
-if scroll?("eycloud")
-  @db_stack = "postgresql"
-end
-
 after_bundler do
-  rake "db:create:all" if config['auto_create']
+  rake "db:create:all"
   
   rakefile("sample.rake") do
 <<-RUBY
@@ -37,13 +33,9 @@ run_before: [eycloud]
 args: -d postgresql
 
 config:
-  - auto_create:
-      type: boolean
-      prompt: "Create local PostgreSQL databases with default configuration?"
-
   - pg_username:
       type: string
-      prompt: "PostgreSQL username:"
+      prompt: "Local development PostgreSQL username:"
   - pg_password:
       type: string
-      prompt: "PostgreSQL password:"
+      prompt: "Local development PostgreSQL password:"

data/scrolls/rails_basics.rb

@@ -23,10 +23,10 @@ RUBY
 ```
 ey deploy
 ```
-
+Remove
 ## Thanks
 
-The original scaffold for this application was created by [App Scrolls](http://railsappscrolls.org).
+The original scaffold for this application was created by [App Scrolls](http://appscrolls.org).
 
 The project was created with the following scrolls:
 

data/scrolls/twitter_bootstrap.rb

@@ -29,7 +29,7 @@ category: stylesheet
 exclusive: stylesheet
 tags: [css, stylesheet]
 
-requires: [simple_form]
+requires: [simple_form, rails_basics]
 run_before: [simple_form]
 
 config:

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscrolls
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   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: &70196379709560 !ruby/object:Gem::Requirement
+  requirement: &70342722850040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70196379709560
+  version_requirements: *70342722850040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70196379708380 !ruby/object:Gem::Requirement
+  requirement: &70342722863260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196379708380
+  version_requirements: *70342722863260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70196379706120 !ruby/object:Gem::Requirement
+  requirement: &70342722858780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70196379706120
+  version_requirements: *70342722858780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70196379726380 !ruby/object:Gem::Requirement
+  requirement: &70342722880760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196379726380
+  version_requirements: *70342722880760
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70196379720980 !ruby/object:Gem::Requirement
+  requirement: &70342722879780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196379720980
+  version_requirements: *70342722879780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196379735760 !ruby/object:Gem::Requirement
+  requirement: &70342722878300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70196379735760
+  version_requirements: *70342722878300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70196379733280 !ruby/object:Gem::Requirement
+  requirement: &70342722874340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196379733280
+  version_requirements: *70342722874340
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70196379730960 !ruby/object:Gem::Requirement
+  requirement: &70342722896460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196379730960
+  version_requirements: *70342722896460
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70196379728900 !ruby/object:Gem::Requirement
+  requirement: &70342722895680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196379728900
+  version_requirements: *70342722895680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70196379755440 !ruby/object:Gem::Requirement
+  requirement: &70342722893980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70196379755440
+  version_requirements: *70342722893980
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70196379754620 !ruby/object:Gem::Requirement
+  requirement: &70342722892740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196379754620
+  version_requirements: *70342722892740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70196379753920 !ruby/object:Gem::Requirement
+  requirement: &70342722891020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70196379753920
+  version_requirements: *70342722891020
 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:
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 703188970612526833
+      hash: 1962164780369127927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 703188970612526833
+      hash: 1962164780369127927
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17