appscrolls 0.10.0 → 0.10.1

data/.gitignore

@@ -6,3 +6,4 @@ dist/*
 .idea
 .rvmrc
 .DS_Store
+tmp

data/ChangeLog.md

@@ -4,6 +4,12 @@
 
 * `puma` - added basic support for Puma; also Cloud Foundry will use Puma automatically
 
+### v0.10.1
+
+* `cfoundry` renamed to `cf`
+* `cf` - automatically creates & binds postgresql/mysql if selected; deletes existing app of same name
+* installation forces installation of latest bundler 1.3.4+ & rails 3.2.13+
+
 ## v0.9
 
 * `Cloud Foundry` - added support for uploading to Cloud Foundry

data/appscrolls.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.summary     = %q{The App Scrolls is a magical tool to generate new Rails and modify existing Rails applications (coming) to include your favourite, powerful magic.}
   s.description = s.summary
 
-  s.add_dependency "activesupport", "~> 3.0"
+  s.add_dependency "bundler", "~> 1.3.4"
+  s.add_dependency "rails", "~> 3.2.13"
   s.add_dependency "i18n"
-  s.add_dependency "rails", "~> 3.2.2"
   s.add_dependency "json", "~> 1.7.0"
   s.add_dependency "thor"
   s.add_development_dependency "cucumber"

data/scrolls/cf.rb

@@ -0,0 +1,88 @@
+# Scroll is based on the following documentation
+# * http://blog.cloudfoundry.com/2012/03/15/using-cloud-foundry-services-with-ruby-part-2-run-time-support-for-ruby-applications/
+# * http://blog.cloudfoundry.com/2012/04/19/deploying-jruby-on-rails-applications-on-cloud-foundry/
+
+vmc_version = '0.3.23'
+
+@name = File.basename(File.expand_path("."))
+
+gem 'vmc', "~> #{vmc_version}"
+gem  'cf-runtime'
+
+required_dbs = %w[mysql postgresql]
+
+selected_db = required_dbs.find { |db| scroll? db }
+unless selected_db
+  say_custom "cf", "Please include a DB choice from: #{required_dbs.join ", "}"
+  exit_now = true
+end
+
+manifest = {"applications"=>
+  {"."=>
+    {"name"=>@name,
+     "framework"=>
+      {"name"=>"rails3",
+       "info"=>
+        {"mem"=>"256M", "description"=>"Rails Application", "exec"=>nil}},
+     "url"=>"${name}.${target-base}",
+     "mem"=>"256M",
+     "instances"=>1,
+     "services"=>{}}}}
+
+case selected_db.to_sym
+when :postgresql
+  manifest["applications"]["."]["services"]["#{@name}-postgresql"] = {"type"=>"postgresql"}
+  db_username = config['pg_username'] || 'root'
+  db_password = config['pg_password'] || ''
+when :mysql
+  manifest["applications"]["."]["services"]["#{@name}-mysql"] = {"type"=>"mysql"}
+end
+
+require "yaml"
+create_file "manifest.yml", manifest.to_yaml
+
+exit 1 if exit_now
+
+after_bundler do
+  run %Q{vmc _#{vmc_version}_ apps | grep "\\b#{@name}\\b" && vmc _#{vmc_version}_ delete #{@name}}
+
+  # Desirable to vendor everything
+  run "bundle package"
+
+  production = <<-YAML.gsub(/^\s{2}/, '')
+  production:
+    adapter: #{selected_db}
+    <% db_svc = CFRuntime::CloudApp.service_props('#{selected_db}') %>
+    database: <%= db_svc[:database] rescue '#{project_name}_production' %>
+    username: <%= db_svc[:username] rescue '#{db_username}' %>
+    password: <%= db_svc[:password] rescue '#{db_password}' %>
+    <%= db_svc && db_svc[:host] ? "host: \#{db_svc[:host]}" : "" %>
+    <%= db_svc && db_svc[:port] ? "port: \#{db_svc[:port]}" : "" %>
+  YAML
+  append_file "config/database.yml", production
+end
+
+after_everything do
+  run "rake assets:precompile"
+  if jruby?
+   run "warble"
+    run "mkdir -p deploy"
+    run "cp #{project_name}.war deploy/"
+  end
+  run "vmc _#{vmc_version}_ push #{project_name} --runtime ruby19 --path . --no-start"
+  run "vmc _#{vmc_version}_ env-add #{project_name} BUNDLE_WITHOUT=assets:test:development"
+  run "vmc _#{vmc_version}_ start #{project_name}"
+end
+
+__END__
+
+name: Cloud Foundry
+description: Prepare codebase and perform initial deploy to a Cloud Foundry target
+website: http://cloudfoundry.org
+author: drnic
+
+requires: []
+run_after: [postgresql, mysql]
+run_before: []
+
+category: deployment

data/scrolls/postgresql.rb

@@ -1,5 +1,3 @@
-gem "pg"
-
 gsub_file "config/database.yml", /username: .*/, "username: #{config['pg_username']}"
 gsub_file "config/database.yml", /password: .*/, "password: #{config['pg_password']}"
 %w[development test production].each do |env|
@@ -31,7 +29,7 @@ author: drnic
 exclusive: orm
 category: persistence
 
-run_before: [eycloud]
+run_before: [eycloud, cf]
 
 args: -d postgresql
 

data/version.rb

@@ -1,3 +1,3 @@
 module AppScrollsScrolls
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscrolls
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,39 +27,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ files:
 - sample.rb
 - scrolls/active_admin.rb
 - scrolls/capybara.rb
-- scrolls/cfoundry.rb
+- scrolls/cf.rb
 - scrolls/cucumber.rb
 - scrolls/delayed_job.rb
 - scrolls/env_yaml.rb
@@ -306,12 +306,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3286780568142603210
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3286780568142603210
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -331,4 +337,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/rails_directory.rb
 - spec/support/template_runner.rb
-has_rdoc: 

data/scrolls/cfoundry.rb

@@ -1,68 +0,0 @@
-# Scroll is based on the following documentation
-# * http://blog.cloudfoundry.com/2012/03/15/using-cloud-foundry-services-with-ruby-part-2-run-time-support-for-ruby-applications/
-# * http://blog.cloudfoundry.com/2012/04/19/deploying-jruby-on-rails-applications-on-cloud-foundry/
-
-gem 'vmc'
-gem  'cf-runtime'
-
-required_dbs = %w[mysql postgresql]
-
-selected_db = required_dbs.find { |db| scroll? db }
-unless selected_db
-  say_custom "cfoundry", "Please include a DB choice from: #{required_dbs.join ", "}"
-  exit_now = true
-end
-
-# TODO similar config for mysql
-db_username = config['pg_username'] || 'root'
-db_password = config['pg_password'] || ''
-
-after_bundler do
-  # Must vendor everything
-  run "bundle package"
-
-  append_file "config/database.yml" do
-  <<-YAML.gsub(/^\s{2}/, '')
-  production:
-    adapter: #{selected_db}
-    <% require 'cfruntime/properties' %>
-    <% db_svc = CFRuntime::CloudApp.service_props('#{selected_db}') %>
-    database: <%= db_svc[:database] rescue '#{project_name}_production' %>
-    username: <%= db_svc[:username] rescue '#{db_username}' %>
-    password: <%= db_svc[:password] rescue '#{db_password}' %>
-    <%= db_svc && db_svc[:host] ? "host: #{db_svc[:host]}" : "" %>
-    <%= db_svc && db_svc[:port] ? "post: #{db_svc[:port]}" : "" %>
-  YAML
-  end
-end
-
-after_everything do
-  run "rake assets:precompile"
-  if jruby?
-   run "warble"
-    run "mkdir -p deploy"
-    run "cp #{project_name}.war deploy/"
-  end
-  run "vmc push #{project_name} --runtime ruby19 --path . --no-start"
-  run "vmc env-add #{project_name} BUNDLE_WITHOUT=assets:test:development"
-  run "vmc start #{project_name}"
-end
-
-__END__
-
-name: CloudFoundry
-description: Prepare codebase and perform initial deploy to a CloudFoundry target
-website: http://cloudfoundry.org
-author: drnic
-
-requires: []
-run_after: [postgresql, mysql]
-run_before: []
-
-category: deployment
-# exclusive:
-
-# config:
-#   - foo:
-#       type: boolean
-#       prompt: "Is foo true?"