capistrano-stats 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8cf50b960c70118fc2b7124c2768666a05ad6d
-  data.tar.gz: 1c99193aba071befb56c6128cd7478b67dbece36
+  metadata.gz: 52515a16e3df21ab213463d1840931b39d946a50
+  data.tar.gz: 7ca3fe990c9b274507d3d0dcc0edc5d0f926399c
 SHA512:
-  metadata.gz: 737a01568351215515d012738a5353f6da532125f266c826345ecd0f49e8793f2c27d9186b84d688cb606078dbd7c4b401e064c71e20d475e001f76717987fcf
-  data.tar.gz: c1e73a8fa0d11f853925599043104bc18b0831aadedf2a45a25dcf99c614d7eb4c13b4efd03c43f91a2df4e6b4e2749617e34bb7a1c6e2cbfaa0db2a93d92f9d
+  metadata.gz: cd70b66c4971c2fba9647bbdd5a0f24dd979bbe44d616933b36545be05cd5579ccf42775429f1342fef097f0eaba8af438a943cb49fdf8709640e1f5211c9f77
+  data.tar.gz: bc24902af73f05881c60fc5a5a979625a0fbc9d35baf35f32af91497a16c3a2f9f6fb11d4a090301f6f0b87878284d1a5f67b7e8dec47a96f7017e66c78f69a9

data/lib/capistrano-stats/metric-collector.rb

@@ -12,16 +12,31 @@ module Capistrano
       @pwd = Pathname.new(pwd)
     end
 
-    def enabled?
+    def user_preference
       ask_to_enable unless File.exists?(sentry_file)
-      File.read(sentry_file).chomp == "true"
+      pref = File.read(sentry_file)
+      if pref.chomp == "true"
+        :full
+      elsif pref.chomp == "false"
+        :ping
+      else
+        pref && pref.to_sym
+      end
     end
 
     def collect
+      return if user_preference == :none
       socket = UDPSocket.new
-      message.anonymize! unless enabled?
+      message.anonymize! unless user_preference == :full
       socket.send(message.to_s, 0, *destination)
-    rescue SocketError
+    rescue SocketError, Errno::EACCES, Errno::EADDRINUSE, Errno::EADDRNOTAVAIL,
+      Errno::EAFNOSUPPORT, Errno::EALREADY, Errno::EBADF, Errno::ECONNREFUSED,
+      Errno::ECONNRESET, Errno::EFAULT, Errno::EHOSTUNREACH, Errno::EINPROGRESS,
+      Errno::EINTR, Errno::EINVAL, Errno::EIO, Errno::EISCONN, Errno::ELOOP,
+      Errno::ENAMETOOLONG, Errno::ENETDOWN,
+      Errno::ENETUNREACH, Errno::ENOBUFS, Errno::ENOENT, Errno::ENOSR,
+      Errno::ENOTDIR, Errno::ENOTSOCK, Errno::EOPNOTSUPP, Errno::EPROTOTYPE,
+      Errno::ETIMEDOUT, Errno::EWOULDBLOCK
       warn "There was a problem tracking statistics, please report to https://github.com/capistrano/stats"
     end
 
@@ -52,7 +67,12 @@ module Capistrano
     def ask_to_enable
       return false unless $stdin.tty?
       show_prompt
-      result = ask_to_confirm("Do you want to enable statistics? (y/N): ")
+      result = ask_to_confirm("Do you want to enable statistics? (y/N): ") ? :full : :ping
+      if result != :full
+        if ask_to_confirm("Do you also want to disable the UDP ping to the metrics server? (y/N): ")
+          result = :none
+        end
+      end
       show_thank_you_note(result)
       write_setting(result)
     end
@@ -62,15 +82,15 @@ module Capistrano
         Would you like to enable statistics?  Here is an example message we would
         send:
 
-        #{message}
+      #{message}
 
       EOF
     end
 
     def show_thank_you_note(result)
-      puts(result ? "Thank you, you may wish to add .capistrano/ to your source
-           control database to avoid future prompts" : "Your preferences have
-           been saved.")
+      puts(result == :full ?
+        "Thank you, you may wish to add .capistrano/ to your source control database to avoid future prompts" :
+        "Your preferences have been saved.")
     end
 
     def message
@@ -95,7 +115,7 @@ module Capistrano
     def write_setting(value)
       Dir.mkdir(sentry_file.dirname) rescue nil
       File.open(sentry_file, "wb") do |f|
-        f.write(value)
+        f.write(value.to_sym)
       end
     end
 

data/lib/capistrano-stats/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Stats
-    VERSION = "1.0.3"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-stats
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Lee Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies: []
 description: Collects anonymous usage statistics about Capistrano to aid with platform
   support and ruby version targeting.