ey_rails_wizard 0.4.0 → 0.5.0

data/ChangeLog.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+* `eycloud` - now using `ey_cli` to create/boot environments
+* `twitter_bootstrap` - based on latest RailsCast
+* `github` - asks for a new repo name if cannot create a repository
+* Better resolution of ordering of nested dependencies... by doing more .sort.sort.sort.... oh noes.
+
 ## v0.4
 
 * SCROLLS ARE IN, "recipes" are out. Wizards use scrolls. Alchemists use recipes.

data/ey_rails_wizard.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Quickly and easily create Rails application templates featuring dozens of popular libraries tuned for Engine Yard Cloud}
 
   s.add_dependency "i18n"
+  s.add_dependency "json", "1.6.5"
   s.add_dependency "activesupport", "~> 3.0"
   s.add_dependency "thor"
   s.add_development_dependency "rspec", "~> 2.5.0"

data/lib/rails/generators/run_template/USAGE

@@ -0,0 +1,13 @@
+Description:
+    Apply an application template to an existing application
+
+    Application templates are traditionally used for new applications. Such as:
+
+      rails new myapp -m /path/to/template.rb
+
+    This generator allows the templates to be reused/reapplied to this existing application.
+
+Example:
+    rails g run_template /path/to/template.rb
+    rails g run_template https://mycompany.com/template.rb
+

data/lib/rails/generators/run_template/run_template_generator.rb

@@ -0,0 +1,13 @@
+class RunTemplateGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument :template_path, :desc => "Path to an application template"
+  
+  def apply_template
+    path = template_path
+    unless path =~ /^https?:\/\//
+      path = File.expand_path(path, Dir.pwd)
+    end
+    apply path
+  end
+end

data/lib/rails_wizard/template.rb

@@ -28,7 +28,7 @@ module RailsWizard
 
 
     def resolve_scrolls
-      @resolve_scrolls ||= scrolls_with_dependencies.sort
+      @resolve_scrolls ||= scrolls_with_dependencies.sort.sort.sort # why do the extra sorts to resolve nesting?!
     end
 
     def scroll_classes

data/scrolls/eycloud.rb

@@ -1,53 +1,62 @@
 @name = File.basename(File.expand_path("."))
-say_custom "eycloud", "Deploying #{@name} to Engine Yard Cloud..."
 
-# gem 'engineyard-v2', :groups => [:development]
-gem 'ey_config'
+gem_group :development do
+  gem 'ey_cli'
+  gem 'engineyard'
+end
+
+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 }
+unless selected_db
+  say_custom "eycloud", "Please include a DB choice from: #{required_dbs.join ", "}"
+  exit_now = true
+end
 
-unless scroll?("mysql") || scroll?("postgresql")
-  say_custom "eycloud", "ERROR: To deploy to Engine Yard Cloud, please include 'mysql' or 'postgresql' scroll."
-  exit 1
+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
 end
 
+exit 1 if exit_now
+
 after_everything do
-  if @mysql_stack
-    say_custom "eycloud", "Using mysql #{@mysql_stack}"
-  elsif @postgresql_stack
-    say_custom "eycloud", "Using postgresql #{@postgresql_stack}"
-  end
-  
-  # run "ey login"
-  # 
-  # require "yaml"
-  # require "engineyard"  # for EY.ui
-  # require "engineyard/eyrc" # to load api token
-  # require "engineyard-cloud-client"
-  # ey_api = EY::CloudClient.new(EY::EYRC.load.api_token)
-  # 
-  # 
-  # say_custom "eycloud", "Fetching list of accounts..."
-  # current_apps = EY::CloudClient::App.all(ey_api)
-  # 
-  # # TODO check if @git_uri is in current_apps, if not then create app
-  # 
-  # accounts = current_apps.map(&:account).uniq
-  # account = multiple_choice("Create app to which Engine Yard Cloud account?", accounts.map {|a| [a.name, a]})
-  # 
-  # say_custom "eycloud", "Creating application #{@name} on account #{account.name}..."
-  # app = EY::CloudClient::App.create(ey_api, {
-  #   "account"        => account,
-  #   "name"           => @name,
-  #   "repository_uri" => @git_uri,
-  #   "app_type_id"    => "rails3"
-  # })
-  # 
-  
-  # TODO how to get deploy key?
-  # How to upload deploy key to github?
+  @git_url ||= `git config remote.origin.url`.strip
+  if @git_url.size == 0
+    say_custom "eycloud", "Skipping... no git URI discovered"
+  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
   
-  # multiple_choice("Let's boot some instances!", [
-  #   [""]
-  # ])
+    framework_env = multiple_choice "Which framework environment?", [%w[Production production], %w[Staging staging]]
+
+    # 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 ||= `ey_cli apps | grep "-" | sed "s/.* //"`.split(/\n/)
+    while @app_names.include?(app_name)
+      app_name = ask_wizard "Application #{app_name} is already taken; what"
+    end
+
+    name = File.basename(".")
+    command = "ey_cli create_app --name #{app_name} --type rails3 "
+    command += "--git #{@git_url} "
+    command += "--framework_env #{framework_env} "
+    command += "--env_name #{@name}_#{framework_env} "
+    command += "--stack #{selected_app_server} "
+    command += "--solo"
+    run command
+
+  end
 end
 
 __END__
@@ -56,7 +65,8 @@ name: Engine Yard Cloud
 description: The Most Powerful Ruby Cloud
 author: drnic
 
-requires: [github]
-run_after: [github]
 category: deployment
 exclusive: deployment
+
+requires: [github]
+run_after: [github]

data/scrolls/github.rb

@@ -1,15 +1,21 @@
 gem 'github', '>= 0.7.0', :group => [:development]
 
 after_everything do
-  if config["github_private"]
-    run "bundle exec gh create-from-local --private"
-  else
-    run "bundle exec gh create-from-local"
+  tried_create_already = false
+  while (@git_uri = `git config remote.origin.url`.strip) && @git_uri.size == 0
+    if tried_create_already
+      @repo_name = ask_wizard "Repository already exists. What project name?"
+    else
+      @repo_name = ""
+    end
+    if config["github_private"]
+      run "bundle exec gh create-from-local #{@repo_name} --private"
+    else
+      run "bundle exec gh create-from-local #{@repo_name}"
+    end
+    tried_create_already = true
   end
-
-  # TODO - what to do if repo already exists? prompt to override?
   
-  @git_uri = `git config remote.origin.url`.strip
   say_custom "github", "Created repo #{@git_uri}"
 end
 
@@ -27,5 +33,6 @@ run_after: [git]
 
 config:
   - github_private:
-      type: boolean
-      prompt: "Creating GitHub repository; want it to be private?"
+      prompt: "Create a GitHub repository?"
+      type: multiple_choice
+      choices: [["Public", false], ["Private", true]]

data/scrolls/mysql.rb

@@ -8,13 +8,13 @@ end
 
 # TODO generate config/database.yml for DBs
 
-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")
+#   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
 
 __END__
 

data/scrolls/passenger.rb

@@ -0,0 +1,10 @@
+
+__END__
+
+name: Passenger
+description: Use Passenger app server
+author: drnic
+website:
+
+category: deployment
+exclusive: appserver

data/scrolls/puma.rb

@@ -5,6 +5,7 @@ __END__
 name: Puma
 description: Ruby web server built for speed & concurrency
 author: drnic
+website: http://puma.io
 
 category: deployment
 exclusive: appserver

data/scrolls/twitter_bootstrap.rb

@@ -0,0 +1,31 @@
+gem_group :assets do
+  gem 'twitter-bootstrap-rails'
+end
+
+after_bundler do
+  generate "bootstrap:install"
+  layout = config["twitter_bootstrap_layout"]
+  generate "bootstrap:layout #{layout}"
+  gsub_file "app/controllers/application_controller.rb", /class ApplicationController < ActionController::Base/, <<-RUBY
+class ApplicationController < ActionController::Base
+  layout "#{layout}"
+RUBY
+  
+end
+
+__END__
+
+name: Twitter Bootstrap Rails
+description: Add Twitter Bootstrap CSS
+
+category: stylesheet
+exclusive: stylesheet
+tags: [css, stylesheet]
+
+config:
+  - twitter_bootstrap_layout:
+      prompt: "Which Twitter Bootstrap layout?"
+      type: multiple_choice
+      choices: [["Fluid", "fluid"], ["Fixed", "fixed"]]
+
+

data/scrolls/{twitter_bootstrap_rails.rb → twitter_bootstrap_rails_v1.rb}

@@ -1,4 +1,6 @@
 gem 'twitter-bootstrap-rails', :git => 'https://github.com/jonochang/twitter-bootstrap-rails.git'
+# TODO only in :group => :assets
+# TODO if jruby, then use static assets
 
 if config['use_simple_form']
   after_everything do

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_rails_wizard
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70322801643620 !ruby/object:Gem::Requirement
+  requirement: &70162210574060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322801643620
+  version_requirements: *70162210574060
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70162210573480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70162210573480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70322801643120 !ruby/object:Gem::Requirement
+  requirement: &70162210572960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322801643120
+  version_requirements: *70162210572960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70322801642700 !ruby/object:Gem::Requirement
+  requirement: &70162210572580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322801642700
+  version_requirements: *70162210572580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322801642160 !ruby/object:Gem::Requirement
+  requirement: &70162210572040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70322801642160
+  version_requirements: *70162210572040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70322801641660 !ruby/object:Gem::Requirement
+  requirement: &70162210571540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70322801641660
+  version_requirements: *70162210571540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70322801657580 !ruby/object:Gem::Requirement
+  requirement: &70162210571080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70322801657580
+  version_requirements: *70162210571080
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70322801657200 !ruby/object:Gem::Requirement
+  requirement: &70162210570700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322801657200
+  version_requirements: *70162210570700
 description: Quickly and easily create Rails application templates featuring dozens
   of popular libraries tuned for Engine Yard Cloud
 email:
@@ -110,6 +121,9 @@ files:
 - autotest/discover.rb
 - bin/ey_rails_wizard
 - ey_rails_wizard.gemspec
+- lib/rails/generators/.DS_Store
+- lib/rails/generators/run_template/USAGE
+- lib/rails/generators/run_template/run_template_generator.rb
 - lib/rails_wizard.rb
 - lib/rails_wizard/command.rb
 - lib/rails_wizard/config.rb
@@ -157,6 +171,7 @@ files:
 - scrolls/oa_oauth.rb
 - scrolls/omniauth.rb
 - scrolls/paper_trail.rb
+- scrolls/passenger.rb
 - scrolls/pow.rb
 - scrolls/prototype.rb
 - scrolls/puma.rb
@@ -181,7 +196,8 @@ files:
 - scrolls/test_unit.rb
 - scrolls/thin.rb
 - scrolls/thinking_sphinx.rb
-- scrolls/twitter_bootstrap_rails.rb
+- scrolls/twitter_bootstrap.rb
+- scrolls/twitter_bootstrap_rails_v1.rb
 - scrolls/unicorn.rb
 - spec/rails_wizard/config_spec.rb
 - spec/rails_wizard/recipe_spec.rb
@@ -210,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 848829872170895105
+      hash: 2342862746662081785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 848829872170895105
+      hash: 2342862746662081785
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17