capistrano-fiftyfive 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed9fece906727e319ca2ba1f1c323656311beaf
-  data.tar.gz: 062dca1468dfd16c7bdd51614509eb6b8e229cf2
+  metadata.gz: 0be8cbab2bac473d93fe1559a4c276ec65209607
+  data.tar.gz: c95b6477716bb9b6551c99d5f4db9440a323fa24
 SHA512:
-  metadata.gz: 43414f1de4670b65b20dfb6c9302622c6bff58b7b9d2c99bc96338f6bbd234e2c87d00ca3f3b36e7ca092f85cafc2e02ba4bf4f03a1b0150b245ef4201673d52
-  data.tar.gz: 2252c5459ea41cd548e7bbe219dd5ba9b1bc61847ab15ec712b9ffdc892f501bb50cef01b7b3d50b013bf279fc7ed204d1b04cbc429519a74eb8f79f841ff196
+  metadata.gz: af38dfc37059163c561ac2c5fafbe4aa5049b7f79e9a1dd0ce4c00eb8001d128f30a3cb4a3174ea083da2f2cc64509ba3bd63e4899762c57973e73347b6c9827
+  data.tar.gz: 89ae486c42f39b1bf23240cabd3fa35be26f79c8f765995d939357b5aeec9438a4722110841309889d2b87cff2d0641c55ebbca6004888b28ba89c538c65b2b0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # capistrano-fiftyfive Changelog
 
+## `0.16.0`
+
+* capistrano-fiftyfive now requires capistrano >= 3.3.5 and sshkit => 1.6.1
+* `ask_secretly` has been removed in favor of Capistrano's built-in `ask ..., :echo => false`
+* `agree` no longer takes an optional second argument
+* highline dependency removed
+* Install libffi-dev so that Ruby 2.2.0 can be compiled
+
 ## `0.15.2`
 
 * The capistrano-fiftyfive GitHub repository has changed: it is now <https://github.com/mattbrictson/capistrano-fiftyfive>.

data/capistrano-fiftyfive.gemspec

@@ -21,10 +21,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano", ">= 3.2.1"
-  spec.add_dependency "sshkit", ">= 1.4.0"
-  spec.add_dependency "colorize"
-  spec.add_dependency "highline"
+  spec.add_dependency "capistrano", ">= 3.3.5"
+  spec.add_dependency "sshkit", ">= 1.6.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/capistrano/fiftyfive/dsl.rb

@@ -29,23 +29,10 @@ module Capistrano
         fetch(:application).to_s.gsub(/[^a-zA-Z0-9_]/, "_")
       end
 
-      # Like capistrano's built-in ask(), but does not echo user input.
-      # Suitable for passwords, etc. Uses the highline gem.
-      #
-      #   ask_secretly(:postgresql_password)
-      #
-      def ask_secretly(key, default=nil)
-        set key, proc{
-          hint = default ? " [#{default}]" : ""
-          answer = HighLine.new.ask("Enter #{key}#{hint}: ") do |q|
-            q.echo = false
-          end.to_s
-        }
-      end
-
-      # Delegates to HighLine's agree() method.
-      def agree(yes_or_no_question, character=nil)
-        HighLine.new.agree(yes_or_no_question, character)
+      # Prints a question and returns truthy if the user answers "y" or "yes".
+      def agree(yes_or_no_question)
+        $stdout.print(yes_or_no_question)
+        $stdin.gets.to_s =~ /^y(es)?/i
       end
 
       # Like capistrano's built-in on(), but connects to the server as root.

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.15.2"
+    VERSION = "0.16.0"
   end
 end

data/lib/capistrano/fiftyfive.rb

@@ -1,5 +1,4 @@
 require "digest"
-require "highline"
 require "monitor"
 require "capistrano/fiftyfive/version"
 require "capistrano/fiftyfive/compatibility"

data/lib/capistrano/tasks/defaults.rake

@@ -42,7 +42,7 @@ namespace :load do
     set :fiftyfive_nginx_force_https, false
     set :fiftyfive_nginx_redirect_hosts, {}
 
-    ask_secretly :fiftyfive_postgresql_password
+    ask :fiftyfive_postgresql_password, nil, :echo => false
     set :fiftyfive_postgresql_max_connections, 25
     set :fiftyfive_postgresql_pool_size, 5
     set :fiftyfive_postgresql_host, "localhost"

data/lib/capistrano/tasks/dotenv.rake

@@ -33,7 +33,7 @@ namespace :fiftyfive do
     def set_up_prompts
       fetch(:fiftyfive_dotenv_keys).each do |key|
         if key.to_s =~ /key|token|secret|password/i
-          ask_secretly(key)
+          ask(key, nil, :echo => false)
         else
           ask(key, nil)
         end

data/lib/capistrano/tasks/rbenv.rake

@@ -63,6 +63,7 @@ namespace :fiftyfive do
       privileged_on release_roles(:all) do |host, user|
         with :debian_frontend => "noninteractive" do
           execute "sudo ~#{user}/.rbenv/plugins/rbenv-bootstrap/bin/rbenv-bootstrap-ubuntu-12-04"
+          execute "sudo aptitude -y -q install libffi-dev"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,56 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Additional Capistrano recipes from 55 Minutes