squash_rails 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 8bdd10e8dc57b292e89be42207a5339aaa2b8c5b
-  data.tar.gz: 7c556cca05fdcd0985630b7c57d728a8c8611a73
-SHA512:
-  metadata.gz: 670f150a4849e2a6657daa78145ddb03f4633d59c263f83309502ac0c2b10a8a53e0dbc2cb442b26df9af4268a1f7d8a9f44fba8ef6b821ea0d41d96daf86794
-  data.tar.gz: 2632fab73a2860025a216feeef8140089f15b3c669633233ae8f891d231becf38cb9f4307c7f3eb9d46e76ad4bc9c2b58160d453c34a1285997bf1abe23eb480
+--- 
+SHA1: 
+  metadata.gz: 6aa376df5e3ff8ecc36ce4f65b648a83cfecbd6a
+  data.tar.gz: c6d3cc0ff2f0e4258b484acb0ad47136ffbf9c89
+SHA512: 
+  metadata.gz: 73c052d2f05fb9e22dede00c555a61fac636008c5c67bd40eab1b9f0c428dd751364ba030c812e8690704f74192cd445dfe23dda37c2e370c700b68af3f88437
+  data.tar.gz: d8da7ebbe0d8f5f4803fa8e21081795ceb8afc0a3c2eec517100482ca3d6f2242f51534ed3cd2bc76b330bf7d104c73add044e634e4180dd13d89b4f3d7369da

data/README.md

@@ -102,10 +102,10 @@ else should be taken care of. For **Capistrano 3**, just add
 
 If you do not deploy to a live Git directory, you will need to write a
 `REVISION` file to your app root. To do this, include the following in your
-`config/deploy.rb` file in Capistrano 3:
+`config/deploy.rb` file in Capistrano 2 or 3:
 
 ```` ruby
-before 'deploy:publishing', 'squash:write_revision'
+before 'deploy:compile_assets', 'squash:write_revision'
 ````
 
 or in Capistrano 2:

data/lib/tasks/squash.cap

@@ -19,10 +19,10 @@ require 'active_support/core_ext/object/try'
 
 set :_squash_current_revision, lambda {
   rev = nil
-  on roles(:web), :limit => 1 do
+  on roles(:web), :in => :sequence, :limit => 1 do
     within repo_path do
       origin = capture("git ls-remote #{fetch(:repo_url)}").chomp.lines.map { |l| l.split(/\s+/) }.index_by(&:last)
-      rev    = origin["refs/heads/#{fetch :branch}"].try!(:first) || capture("git rev-parse #{fetch :branch}").chomp
+      rev    = origin["refs/heads/#{fetch :branch}"].try(:first) || capture("git rev-parse #{fetch :branch}").chomp
     end
   end
   rev
@@ -32,22 +32,19 @@ namespace :squash do
   # USAGE: before 'deploy:publishing', 'squash:write_revision'
   desc "Writes a REVISION file to the application's root directory"
   task :write_revision do
-    on roles(:app) do
+    # must be run in serial because the fetch for _squash_current_revision results
+    # in a deadlock otherwise
+    on roles(:app), :in => :sequence, :limit => 1 do
       execute %{echo "#{fetch :_squash_current_revision}" > #{release_path.join('REVISION')}}
     end
   end
 
   desc "Notifies Squash of a new deploy"
   task :notify do
-    on roles(:web), :limit => 1 do
+    on roles(:web), :limit => 1 do |host|
       within release_path do
-        with :rails_env => fetch(:rails_env) do
-          command = if test("[ -e #{release_path.join('bin', 'rails')} ]")
-                      'bin/rails'
-                    else
-                      'script/rails'
-                    end
-          execute command, "runner 'Squash::Ruby.notify_deploy #{fetch(:rails_env).inspect}, #{fetch(:_squash_current_revision).inspect}, #{Socket.gethostname.inspect}'"
+        with rails_env: fetch(:rails_env) do
+          execute :rake, "squash:notify[#{fetch(:current_revision)}]"
         end
       end
     end

data/lib/tasks/squash.rake

@@ -0,0 +1,7 @@
+namespace :squash do
+  desc "notify a release"
+  task :notify, [:revision] => :environment do |t, options|
+    puts "Running in env #{Rails.env} and with options #{options}"
+    Squash::Ruby.notify_deploy Rails.env, options[:revision], Socket.gethostname.inspect
+  end
+end

metadata

@@ -1,107 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: squash_rails
-version: !ruby/object:Gem::Version
-  version: 1.3.3
+version: !ruby/object:Gem::Version 
+  version: 1.3.4
 platform: ruby
-authors:
+authors: 
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: squash_ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2015-03-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id003 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  name: squash_ruby
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 4.0.0
+  requirement: *id002
+  prerelease: false
+  name: rails
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  requirement: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  requirement: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.0.0
-  type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: redcarpet
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id003
+  requirement: *id007
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: jeweler
 description: This client library records Ruby on Rails exceptions to Squash.
 email: tim@squareup.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.md
-files:
+files: 
 - LICENSE.txt
 - README.md
 - lib/squash/rails.rb
@@ -115,29 +89,30 @@ files:
 - lib/squash/ruby/railtie.rb
 - lib/squash_rails.rb
 - lib/tasks/squash.cap
+- lib/tasks/squash.rake
 - rails/init.rb
 homepage: http://github.com/SquareSquash/rails
-licenses:
+licenses: 
 - Apache 2.0
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Squash client for Ruby on Rails projects
 test_files: []
+