daddy 0.1.23 → 0.1.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQ4OTBmMWEwNWZmM2NiZDA5ZjAzMzI0ZTc1Yzk2MzVhZWNiODgzNw==
+    MTc3MWEzMzY3ZjJmOTAyOWU3NWI4MTEyY2Q4YzZlYzRlYWQ2MTgxMg==
   data.tar.gz: !binary |-
-    MGJmNzZmNjMwN2E1ZDEwMTRmNTAyMTE2NTAyMDNhZTQ5OTg4OTlhYQ==
+    NzQ5MDc4ZjU5MDNkYTAzZGY0OTliMTg0MTYxNmU2MzM4ZmY1YjZjOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWM2MjdlY2E0ZmM0N2QwZDZjNDkwNTdiOTI4OWQwNGIyNDRlMmNlZGYxYTQw
-    YTE1MDJkNWM4NjdmYzhlOGJlYmI4NzEwZDY5N2U4ZGNlN2I5NDZjZTVmZGRi
-    MzgzZTJlMGNmMTVhMjk2NjBjMDVjYWRkNjRlNjAwMGJmM2VjNzA=
+    N2I2YTk1Y2QzODc4ZWIzMzUzNDZjMDdkNzQ0MDhkMzk1M2IwOTExN2E3MWE4
+    MDJlOTdiNWM2NmY1ZDcxYzlhOTU5NjdhZGExMzFkNzRmYjhmMGM2NmVkYzdl
+    ZDFhZjY2ZDhiMTJlM2E5NjI4Njg5ZmMyMzU0NjJmY2MzNjkzMGI=
   data.tar.gz: !binary |-
-    OTBlZWM0YjE5YTFjYmJlMTI4ODQyZWUyMDdlYzEzZWFhYmI2MDY4MGIzYmFk
-    MmFjN2ZkNzJjMjQ1M2M1YjZlMzAzYjcxNWZkZmY4N2QzZmRhZTU0ZTMyODhj
-    ZDc3MGE1YTI3MTJlYzAzNDdlNTQyMzdjZTAxZmUwMzI0MGU4Mzk=
+    NzI0NjY1NWQ4MWMwMjJhMmIwMmE0Y2ZlM2FjZjgzNDZjOWJhYzVjN2IxZTJk
+    Y2MwNzg0OTIwYTczMDgzMTZkNDYxN2U0OTkxYzk4M2QzMDVjYjM3MmNmN2U0
+    NDI1ODVkMjg0YjIzZDdlZjg0NzY5YjhiZTA0ZjczYjY5NzVlNWY=

data/bin/dad

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
+RAILS_VERSION = '3.2.16'
+
 GEMFILE = <<-EOF
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.15'
+gem 'rails', '#{RAILS_VERSION}'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -49,10 +51,9 @@ action = ARGV[0]
 
 if action == 'new'
   app_name = ARGV[1]
-  rails_version = "3.2.15"
   
   [
-    "rails _#{rails_version}_ new #{app_name} -d mysql --skip-bundle",
+    "rails _#{RAILS_VERSION}_ new #{app_name} -d mysql --skip-bundle",
     "echo \"#{GEMFILE}\" > #{app_name}/Gemfile",
     "cd #{app_name} && sudo bundle install",
     "cd #{app_name} && bundle exec rake dad:install",

data/lib/daddy/cucumber/pause.rb

@@ -10,10 +10,10 @@ module Daddy
       end
       
       def wait_until
-        pause_count = 5
+        pause_count = 10
         while pause_count > 0 do
           break if yield
-          pause
+          pause 1
           pause_count -= 1
         end
       end

data/lib/tasks/nginx.app.conf.erb

@@ -1,5 +1,5 @@
 upstream <%= ENV['APP_NAME'] %> {
-  server unix:/tmp/<%= ENV['APP_NAME'] %>.sock;
+  server unix:/tmp/<%= ENV['APP_NAME'] %>_<%= ENV['RAILS_ENV'][0..2] %>.sock;
 }
 
 server {

data/lib/tasks/publish.rake

@@ -74,7 +74,7 @@ namespace :dad do
 end
 
 def self.dad_publish_sprint_dirs(base_dir)
-  ret = Dir[base_dir + '/p*'].sort{|a, b| File.basename(a)[1..-1].to_i <=> File.basename(b)[1..-1].to_i}
+  ret = Dir[base_dir + '/p*'].sort{|a, b| File.basename(a)[1..-1].to_f <=> File.basename(b)[1..-1].to_f}
   ret << base_dir + '/master'
   ret
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara