appscrolls 0.11.1 → 0.11.2

data/ChangeLog.md

@@ -8,6 +8,10 @@
 
 * `sidekiq` - correctly create the app/workers directory
 
+### v0.11.2
+
+* `redis` - use integer for redis database number [thx @mperham]
+
 ## v0.10
 
 * `puma` - added basic support for Puma; also Cloud Foundry will use Puma automatically

data/scrolls/cf.rb

@@ -72,13 +72,21 @@ after_everything do
     run "mkdir -p deploy"
     run "cp #{project_name}.war deploy/"
   end
-  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}"
+  run_vmc "push #{project_name} --runtime #{@cf_ruby_runtime} --path . --no-start"
+  run_vmc "env-add #{project_name} BUNDLE_WITHOUT=assets:test:development"
+  run_vmc "start #{project_name}"
+end
+
+def vmc
+  "vmc _#{@vmc_version}_"
+end
+
+def run_vmc(command)
+  run "#{vmc} #{command}"
 end
 
 def cf_delete_app(name)
-  run %Q{vmc _#{@vmc_version}_ apps | grep "\\b#{name}\\b" && vmc _#{@vmc_version}_ delete #{name}}
+  run %Q{#{vmc} apps | grep " #{name} " && #{vmc} delete #{name}}
 end
 
 def cf_standalone_command(key, name, command, services={})

data/scrolls/sidekiq.rb

@@ -5,9 +5,9 @@ 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"
+  redis_url = "redis://:\#{$redis_config[:password]}@\#{$redis_config[:host]}:\#{$redis_config[:port]}/0"
 else
-  redis_url = "redis://\#{$redis_config[:host]}:\#{$redis_config[:port]}/sidekiq"
+  redis_url = "redis://\#{$redis_config[:host]}:\#{$redis_config[:port]}/0"
 end
 Rails.logger.info "Setting sidekiq redis: \#{{ url: redis_url, namespace: 'sidekiq' }.inspect}"
 Sidekiq.redis = { url: redis_url, namespace: 'sidekiq' }
@@ -40,7 +40,7 @@ after_everything do
     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}"
+    run_vmc "push #{worker_name} --path . --manifest #{manifest_file}"
   end
 end
 

data/version.rb

@@ -1,3 +1,3 @@
 module AppScrollsScrolls
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appscrolls
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -308,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4522320187037032621
+      hash: -2129944534686319540
 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: -4522320187037032621
+      hash: -2129944534686319540
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25