capistrano 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5fec938fed98daad8d2ce764486a4b059095a1a
-  data.tar.gz: 5c46c098df29b9ea0f08a07db3270d83dcc598a3
+  metadata.gz: 6f29153f55673d7e5e6d7941c8ff781bd98e7c75
+  data.tar.gz: 6685c780f1e49372c56de8af1665736c4e8c7c5d
 SHA512:
-  metadata.gz: ddfb0bdd5ea6266b25c6f96c02d466238f450ead5b4c47d13140c40db509ef92718dda37fefae01a364a812144d6cee16682be6ebfaa2274f1bdb558f218ff8f
-  data.tar.gz: f4e4fe76dacb08739437eaf3c83397f9119d8858ae23dff58b75c3325c380d0ca51cb995ebb26f00389aee9309a1eacad774bbf8c3da777c35640395715097b2
+  metadata.gz: 78b8c50f1ca69b7a705c64114b3a7488a8a8ed22418a7ecb1f13faf3ebe9b7322694c5ea9bc84b32f80499419b1aa8e2a886a2c9ee6c04970a52075677d3c7c1
+  data.tar.gz: e4717b8b7a5bbf1515474f40c949f7060640286c1223394e1c34466a7df69218e6d1dfae063595ec637f983602786689a5bf00146b8fdf7425f80d52f58d52aa

data/CHANGELOG.md

@@ -4,11 +4,20 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/capistrano/capistrano/compare/v3.2.1...v3.3.0
+https://github.com/capistrano/capistrano/compare/v3.3.4...HEAD
+
+## `3.3.4`
+
+* Minor changes:
+  * Rely on a newer version of capistrano-stats with better privacy (@leehambley)
+  * Fix cucumber spec for loading tasks from stage configs (@sponomarev)
+  * Minor documentation fixes (@deeeki, @seuros, @andresilveira)
+  * Spec improvements (@dimitrid, @sponomarev)
+  * Fix to CLI flags for git-ls-remote (@dimitrid)
 
 ## `3.3.3`
 
-https://github.com/capistrano/capistrano/compare/v3.2.1...v3.3.0
+https://github.com/capistrano/capistrano/compare/v3.2.1...v3.3.3
 
 * Enhancement (@townsen)
   * Added the variable `:repo_tree` which allows the specification of a sub-tree that
@@ -33,7 +42,7 @@ https://github.com/capistrano/capistrano/compare/v3.2.1...v3.3.0
     If the full unexpurgated backtrace is required then the --backtrace
     and --trace options supply it as before.
 
-* Disable loading stages configs on `cap -T`
+* Disable loading stages configs on `cap -T` (@sponomarev)
 * Track (anonymous) statistics, see https://github.com/capistrano/stats
 
 * Enhancements (@townsen)

data/README.md

@@ -17,7 +17,7 @@ Get <a href="http://codersclan.net/?repo_id=325&source=link">Capistrano support
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'capistrano', '~> 3.2.0'
+gem 'capistrano', '~> 3.3.0'
 ```
 
 And then execute:
@@ -232,7 +232,7 @@ DEBUG [9ce34809]  leehambley pts/0        2013-06-13 17:11 (port-11262.pppoe.wtn
 ## VCS Requirements
 
 Capistano requires modern versions of Git, Mercurial and Subversion
-respectively (if you are using that particular VCS). Git Git requirement is at
+respectively (if you are using that particular VCS). Git requirement is at
 least version 1.8.x. Mercurial and Subversion, any modern version should
 suffice.
 
@@ -350,11 +350,31 @@ $ rake features
 $ rake features KEEP_RUNNING=1
 ```
 
+## Metrics
+
+Since version 3.3.3 Capistrano includes anonymous metrics. The metric server,
+gem collection, and when it exists, the HTML/d3 page to view the metrics are
+all open-source and available for inspection and audit at
+https://github.com/capistrano/stats
+
+**Notes for CI**: If you commit the file `.capistrano/metrics` to your source
+control, you will not be prompted again, this is what we expect you to do, and
+it should also avoid breaking your CI server by blocking waiting for an answer
+on standard in. The metric prompt is also [disabled when standard in is not a
+tty](https://github.com/capistrano/stats/blob/77c9993d3ee604520712261aa2a70c90f3b96a6f/gem/lib/capistrano-stats/metric-collector.rb#L53)
+(when using Capistrano from scripts, or from come well behaved CI services)
+
+* The gem invites users to opt-into metrics collection when the task
+  `load:defaults` is called. A project-specific hash derived from the output of
+  `git config remote.origin.url` is written to a file `.capistrano/metrics` to
+  allow us to differentiate between many members of the same team deploying the
+  same project vs. many people on many projects.
+
 ## License
 
 MIT License (MIT)
 
-Copyright (c) 2012-2013 Tom Clements, Lee Hambley
+Copyright (c) 2012-2015 Tom Clements, Lee Hambley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/capistrano.gemspec

@@ -29,7 +29,7 @@ eos
 
   gem.required_ruby_version = '>= 1.9.3'
   gem.add_dependency 'sshkit', '~> 1.3'
-  gem.add_dependency 'capistrano-stats', '~> 1.0.3'
+  gem.add_dependency 'capistrano-stats', '~> 1.1.0'
   gem.add_dependency 'rake', '>= 10.0.0'
   gem.add_dependency 'i18n'
 

data/features/configuration.feature

@@ -19,12 +19,10 @@ Feature: The path to the configuration can be changed, removing the need to
     Then the task is successful
     And contains "install" in the output
 
-  # Feature disabled because this is not how it works, we don't load
-  # tasks from stage files, as we expect them to be defined in ./lib/tasks
-  # Scenario: Show install task with configuration in a custom location
-  #   And config stage file has line "desc 'Special Task'"
-  #   And config stage file has line "task :special_stage_task"
-  #   But the configuration is in a custom location
-  #   When I run "cap -T"
-  #   Then the task is successful
-  #   And contains "special_stage_task" in the output
+  Scenario: Hide install task with configuration in a custom location
+    And config stage file has line "desc 'Special Task'"
+    And config stage file has line "task :special_stage_task"
+    But the configuration is in a custom location
+    When I run "cap -T"
+    Then the task is successful
+    And doesn't contain "special_stage_task" in the output

data/features/step_definitions/assertions.rb

@@ -109,3 +109,7 @@ end
 Then(/contains "(.*?)" in the output/) do |expected|
   expect(@output).to include(expected)
 end
+
+Then(/doesn't contain "(.*?)" in the output/) do |expected|
+  expect(@output).not_to include(expected)
+end

data/lib/capistrano/git.rb

@@ -18,7 +18,7 @@ class Capistrano::Git < Capistrano::SCM
     end
 
     def check
-      git :'ls-remote -h', repo_url
+      git :'ls-remote --heads', repo_url
     end
 
     def clone

data/lib/capistrano/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

data/spec/lib/capistrano/git_spec.rb

@@ -31,7 +31,7 @@ module Capistrano
     describe "#check" do
       it "should test the repo url" do
         context.expects(:repo_url).returns(:url)
-        context.expects(:execute).with(:git, :'ls-remote -h', :url).returns(true)
+        context.expects(:execute).with(:git, :'ls-remote --heads', :url).returns(true)
 
         subject.check
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement