capistrano-harrow 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e8e793ccd1dc35faf097eab9b91efa4998814e
-  data.tar.gz: e8bff1060e533c53a5d48e349a439715d5f078bf
+  metadata.gz: 7348d2fff68dd4c25e1c96fd59de412db7058f73
+  data.tar.gz: 1ed8bd7185262d7c0501cadf7f7af095d158489b
 SHA512:
-  metadata.gz: 085035cbc8f19ba9250483ca635b6d3637a93435c513d2f3b8bd79806731b0c9dbfdb9991d36e7cd17fa145c056d39fa82411dd23ad36bc90ff240b47d8f2031
-  data.tar.gz: f59340879926938d78723f55d68abf54525c881bf656514314849241d19fc8e1e319402dd5f3356288143e738c167757a242edee9061edb45af38d1d2cf5dae1
+  metadata.gz: 23e220496e00e4ad0877cf7346aa306cc1f586f122c7eb25c50bf83fe67654271b83a3c0ab3f5964fbe8fe5d9cb3a107929a4bd809dfd7682cf5fca9de088cc4
+  data.tar.gz: 418470ac85cf41759192517462757521e527817d542cc4456b3c34a23a3a6008c416808754942feba56ac365ca1deaef800bf3dad48abf3e56e98a5b5f1289ad

data/lib/capistrano/harrow/api.rb

@@ -35,7 +35,11 @@ module Capistrano
 
         case response
         when Net::HTTPSuccess
-          return ::JSON.parse(response.body, symbolize_names: true).fetch(:participating, false)
+          parsed_body = ::JSON.parse(response.body, symbolize_names: true)
+          is_participating = parsed_body.delete(:participating)
+          return false unless is_participating
+
+          return parsed_body
         end
 
         false

data/lib/capistrano/harrow/installer.rb

@@ -65,10 +65,7 @@ For this repository with the URL:
   %<repository_url>s
 
 },
-      }
-
-      def self.preinstall_message
-        %q{
+   preinstall: %q{
  - Free for small projects!
 
  - Test, deploy and collaborate online easily
@@ -80,11 +77,16 @@ For this repository with the URL:
  - Works seamlessly for PHP, Node.js, Ansible, Python, Go,
    Capistrano and more!
 
-}
+},
+
+      }
+
+      def message(tag, format_data)
+        sprintf(@messages.fetch(tag, tag.to_s), format_data)
       end
 
-      def self.message(tag, format_data)
-        sprintf(MESSAGES.fetch(tag, tag.to_s), format_data)
+      def prompt(tag)
+        @prompts.fetch(tag, tag.to_s)
       end
 
       def initialize(params={ui: UI::TTY, api: API, config: Config::Git})
@@ -93,18 +95,22 @@ For this repository with the URL:
         @api = params.fetch(:api)
         @quit = false
         @password = nil
+        update_message_catalog!({messages: MESSAGES,
+                                 prompts: PROMPTS})
       end
 
       def install!
         return if @config.disabled?
         return if @config.installed?
-        return unless @api.participating?(signup_data)
+        messages = @api.participating?(signup_data)
+        return unless messages
+        update_message_catalog!(messages)
 
         @ui.show Banner.new.to_s
-        @ui.show self.class.preinstall_message
+        @ui.show message(:preinstall, {})
 
         begin
-          if @ui.prompt(PROMPTS[:want_install]).downcase == 'no'
+          if @ui.prompt(prompt(:want_install)).downcase == 'no'
             quit!
             return
           end
@@ -116,16 +122,16 @@ For this repository with the URL:
         data = signup_data
         if data[:email].to_s.empty? or data[:name].to_s.empty?
           begin
-            data[:name] = @ui.prompt(PROMPTS[:enter_name], [])
-            data[:email] = @ui.prompt(PROMPTS[:enter_email], [])
+            data[:name] = @ui.prompt(prompt(:enter_name), [])
+            data[:email] = @ui.prompt(prompt(:enter_email), [])
           rescue UI::TimeoutError
             quit!("timeout")
           end
         end
 
-        @ui.show self.class.message(:signup_data, data)
+        @ui.show message(:signup_data, data)
         unless data[:repository_url].to_s.empty?
-          @ui.show self.class.message(:repository, data)
+          @ui.show message(:repository, data)
         end
 
         @password = prompt_password!
@@ -152,7 +158,7 @@ For this repository with the URL:
         end
 
         @quit = true
-        @ui.show(self.class.message(:aborting,{reason: reason}))
+        @ui.show(message(:aborting,{reason: reason}))
       end
 
       def quit?
@@ -168,21 +174,21 @@ For this repository with the URL:
           @config.organization_uuid = response_data[:organization_uuid]
           if response_data.fetch(:reason, 'ok') == 'invalid'
             if response_data.fetch(:errors, {}).fetch(:email, []).first == 'not_unique'
-              @ui.show self.class.message(:existing_account_found, {})
+              @ui.show message(:existing_account_found, {})
               return :account_exists
             else
-              @ui.show self.class.message(:api_fatal_error, {})
+              @ui.show message(:api_fatal_error, {})
               return response_data
             end
           else
-            @ui.show self.class.message(:installation_successful, response_data)
+            @ui.show message(:installation_successful, response_data)
             return :signed_up
           end
         rescue API::NetworkError
-          @ui.show self.class.message(:api_network_error, {})
+          @ui.show message(:api_network_error, {})
           should_retry = false
           begin
-            if @ui.prompt(PROMPTS[:retry_request], [:no, :yes]) == :yes
+            if @ui.prompt(prompt(:retry_request), [:no, :yes]) == :yes
               should_retry = true
             end
           rescue UI::TimeoutError
@@ -192,10 +198,10 @@ For this repository with the URL:
 
           retry if should_retry
         rescue API::ProtocolError
-          quit! self.class.message(:api_protocol_error, {})
+          quit! message(:api_protocol_error, {})
           return
         rescue API::FatalError
-          quit! self.class.message(:api_fatal_error, {})
+          quit! message(:api_fatal_error, {})
           return
         end
       end
@@ -203,22 +209,31 @@ For this repository with the URL:
       def prompt_password!
         tries = 3
         while tries > 0
-          password = @ui.prompt_password(PROMPTS[:enter_password])
-          confirmed_password = @ui.prompt_password(PROMPTS[:confirm_password])
+          password = @ui.prompt_password(prompt(:enter_password))
+          confirmed_password = @ui.prompt_password(prompt(:confirm_password))
 
 
           if password == confirmed_password && password.to_s.length >= 10
             return password
           elsif password.to_s.length < 10
-            @ui.show self.class.message(:password_too_short, {})
+            @ui.show message(:password_too_short, {})
           else
-            @ui.show self.class.message(:password_mismatch, {})
+            @ui.show message(:password_mismatch, {})
           end
 
           tries = tries - 1
         end
       end
 
+      def update_message_catalog!(new_messages)
+        return unless new_messages.respond_to? :fetch
+        @messages = {} unless @messages
+        @prompts = {} unless @prompts
+
+        @messages.merge!(new_messages.fetch(:messages, {}))
+        @prompts.merge!(new_messages.fetch(:prompts, {}))
+      end
+
     end
   end
 end

data/lib/capistrano/harrow/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Harrow
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-harrow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler