appscrolls 0.10.1 → 0.11.0

data/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v0.11
+
+* `sidekiq` - adds sidekiq gem & web dashboard (hidden via secret string); can deploy worker to Cloud Foundry
+
 ## v0.10
 
 * `puma` - added basic support for Puma; also Cloud Foundry will use Puma automatically

data/scrolls/cf.rb

@@ -2,13 +2,16 @@
 # * 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'
+require "yaml"
 
+@vmc_version = '0.3.23'
 @name = File.basename(File.expand_path("."))
+@cf_ruby_runtime = "ruby19" # might change later in scrolls
 
-gem 'vmc', "~> #{vmc_version}"
+gem 'vmc', "~> #{@vmc_version}"
 gem  'cf-runtime'
 
+known_services = %w[postgresql mysql redis mongodb]
 required_dbs = %w[mysql postgresql]
 
 selected_db = required_dbs.find { |db| scroll? db }
@@ -17,7 +20,7 @@ unless selected_db
   exit_now = true
 end
 
-manifest = {"applications"=>
+$cf_manifest = {"applications"=>
   {"."=>
     {"name"=>@name,
      "framework"=>
@@ -25,26 +28,24 @@ manifest = {"applications"=>
        "info"=>
         {"mem"=>"256M", "description"=>"Rails Application", "exec"=>nil}},
      "url"=>"${name}.${target-base}",
+     "runtime"=>@cf_ruby_runtime,
      "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"}
+known_services.each do |service|
+  if scroll? service
+    $cf_manifest["applications"]["."]["services"]["#{@name}-#{service}"] = {"type"=>service}
+  end
 end
 
-require "yaml"
-create_file "manifest.yml", manifest.to_yaml
+db_username = config['pg_username'] || 'root'
+db_password = config['pg_password'] || ''
 
 exit 1 if exit_now
 
 after_bundler do
-  run %Q{vmc _#{vmc_version}_ apps | grep "\\b#{@name}\\b" && vmc _#{vmc_version}_ delete #{@name}}
+  cf_delete_app @name
 
   # Desirable to vendor everything
   run "bundle package"
@@ -63,15 +64,39 @@ after_bundler do
 end
 
 after_everything do
+  create_file "manifest.yml", $cf_manifest.to_yaml
+
   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}"
+  run "vmc _#{@vmc_version}_ push #{project_name} --runtime #{@cf_ruby_runtime} --path . --no-start"
+  run "vmc _#{@vmc_version}_ env-add #{project_name} BUNDLE_WITHOUT=assets:test:development"
+  run "vmc _#{@vmc_version}_ start #{project_name}"
+end
+
+def cf_delete_app(name)
+  run %Q{vmc _#{@vmc_version}_ apps | grep "\\b#{name}\\b" && vmc _#{@vmc_version}_ delete #{name}}
+end
+
+def cf_standalone_command(key, name, command, services={})
+  cf_manifest = {"applications"=>
+    {"."=>
+      {"name"=>name,
+       "framework"=>
+        {"name"=>"standalone",
+         "info"=>
+          {"mem"=>"64M", "description"=>"Standalone Application", "exec"=>nil}},
+       "url"=>nil,
+       "runtime"=>@cf_ruby_runtime,
+       "command"=>command,
+       "mem"=>"256M",
+       "instances"=>1,
+       "services"=>services}}}
+  create_file "manifest.#{key}.yml", cf_manifest.to_yaml
+  "manifest.#{key}.yml"
 end
 
 __END__

data/scrolls/redis.rb

@@ -1,7 +1,23 @@
 gem 'redis'
 
 initializer "redis.rb", <<-RUBY
-REDIS = Redis.new
+if ENV['VCAP_SERVICES']
+  $vcap_services ||= JSON.parse(ENV['VCAP_SERVICES'])
+  redis_service_name = $vcap_services.keys.find { |svc| svc =~ /redis/i }
+  redis_service = $vcap_services[redis_service_name].first
+  $redis_config = {
+    host: redis_service['credentials']['host'],
+    port: redis_service['credentials']['port'],
+    password: redis_service['credentials']['password']
+  }
+else
+  $redis_config = {
+    host: '127.0.0.1',
+    port: 6379
+  }
+end
+
+$redis = Redis.new($redis_config)
 RUBY
 
 if scroll? "eycloud_recipes_on_deploy"

data/scrolls/sidekiq.rb

@@ -0,0 +1,63 @@
+gem "sidekiq"
+# slim/sinatra are used for the sidekiq monitoring UI at /sidekiq/SECRET
+gem "slim"
+gem "sinatra", ">= 1.3.0", require: false
+
+initializer "sidekiq.rb", <<-RUBY
+if $redis_config[:password]
+  redis_url = "redis://:\#{$redis_config[:password]}@\#{$redis_config[:host]}:\#{$redis_config[:port]}/sidekiq"
+else
+  redis_url = "redis://\#{$redis_config[:host]}:\#{$redis_config[:port]}/sidekiq"
+end
+Rails.logger.info "Setting sidekiq redis: \#{{ url: redis_url, namespace: 'sidekiq' }.inspect}"
+Sidekiq.redis = { url: redis_url, namespace: 'sidekiq' }
+RUBY
+
+if scroll? "eycloud_recipes_on_deploy"
+  gem "eycloud-recipe-sidekiq", :group => :eycloud
+
+  append_file "deploy/cookbooks/main/recipes/default.rb", <<-RUBY
+
+  require_recipe "sidekiq"
+  RUBY
+end
+
+directory "app/workers"
+create_file "app/workers/.gitkeep", ""
+
+after_bundler do
+  route <<-RUBY
+require "sidekiq/web"
+  mount Sidekiq::Web, at: "/sidekiq/#{config['sidekiq_admin_secret']}"
+  require "sidekiq/api"
+  match "queue-status" => proc { [200, {"Content-Type" => "text/plain"}, [Sidekiq::Queue.new.size < 100 ? "OK" : "UHOH" ]] }
+RUBY
+end
+
+after_everything do
+  if scroll? "cf"
+    worker_name = "#{@name}-worker"
+    services = $cf_manifest["applications"]["."]["services"]
+    manifest_file = cf_standalone_command("worker", worker_name, "bundle exec sidekiq -e production", services)
+    cf_delete_app worker_name
+    run "vmc _#{@vmc_version}_ push #{worker_name} --runtime #{@cf_ruby_runtime} --path . --manifest #{manifest_file}"
+  end
+end
+
+__END__
+
+name: Sidekiq
+description: Simple, efficient message processing for your Rails 3 application
+author: drnic
+
+exclusive: worker
+category: worker
+tags: [worker,background-tasks]
+
+requires: [redis]
+run_after: [redis, eycloud_recipes_on_deploy, cf]
+
+config:
+  - sidekiq_admin_secret:
+      type: string
+      prompt: "Enter a secret string for the route /sidekiq/SECRET:"

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscrolls
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -230,6 +230,7 @@ files:
 - scrolls/redis.rb
 - scrolls/resque.rb
 - scrolls/rspec.rb
+- scrolls/sidekiq.rb
 - scrolls/simple_form.rb
 - scrolls/split.rb
 - scrolls/sqlite3.rb
@@ -276,7 +277,6 @@ files:
 - scrolls/untested/sequel.rb
 - scrolls/untested/settingslogic.rb
 - scrolls/untested/shoulda_matchers.rb
-- scrolls/untested/sidekiq.rb
 - scrolls/untested/slim.rb
 - scrolls/untested/spork.rb
 - scrolls/untested/thinking_sphinx.rb
@@ -308,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3286780568142603210
+      hash: 4286488136917017513
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3286780568142603210
+      hash: 4286488136917017513
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/scrolls/untested/sidekiq.rb

@@ -1,23 +0,0 @@
-gem "sidekiq"
-
-if scroll? "eycloud_recipes_on_deploy"
-  gem "eycloud-recipe-sidekiq", :group => :eycloud
-
-  append_file "deploy/cookbooks/main/recipes/default.rb", <<-RUBY
-
-  require_recipe "sidekiq"
-  RUBY
-end
-
-__END__
-
-name: Sidekiq
-description: Simple, efficient message processing for your Rails 3 application
-author: drnic
-
-exclusive: worker
-category: worker
-tags: [worker,background-tasks]
-
-requires: [redis]
-run_after: [redis, eycloud_recipes_on_deploy]