deploy-agent 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aadc6e314dba14514c9015a73252decf65bb13f
-  data.tar.gz: fc71bae393b1edeff76eaee62e131f62f49fe989
+  metadata.gz: 5e1c889d6e8699972cf1452a86c42d9be633cc65
+  data.tar.gz: dd2f460d6e6d8fbaeac3da023719f7a5c04b62fe
 SHA512:
-  metadata.gz: 10e1cd86b9db41700f5d9aa7013f12af2e6d159f6ba8e2645e46c8691a36ca33fba613e56540bcb7a53aa8d0c3d1d8e91a3a3fe59994a7c0d4caf45a8478daa6
-  data.tar.gz: cbbb62930a9504f883e51e9fca32ee824760902d333cd28de98a92eee7d645631d714dc86490b0d786848a48ea7a7b124bb5b985a35e05152a56d285711bb13f
+  metadata.gz: 6eb91a06b4226c38fbd7e5ca0f8f28897a36e3c19e4079e52a2f6b1702e3d67883fa2561840977d024ecf3f28815e5f29b39793b8f39a30fb8d1a7f175c00259
+  data.tar.gz: 9e3bca578a01b6b578c48a353f447db801f70d661b1b395a120467613f0990b3e3df516c99f315f550115f5b76964184c12b154eb3e312bf185c339def5af10d

data/lib/deploy_agent.rb

@@ -1,4 +1,4 @@
-require 'deploy_agent/certificate_manager'
+require 'deploy_agent/configuration_generator'
 require 'deploy_agent/server_connection'
 require 'deploy_agent/destination_connection'
 require 'deploy_agent/cli'

data/lib/deploy_agent/cli.rb

@@ -13,7 +13,7 @@ module DeployAgent
     end
 
     def setup
-      CertificateManager.new.generate_certificate
+      ConfigurationGenerator.new.configure
     end
 
     def restart

data/lib/deploy_agent/configuration_generator.rb

@@ -0,0 +1,119 @@
+require 'readline'
+require 'net/https'
+require 'json'
+require 'fileutils'
+
+module DeployAgent
+  class ConfigurationGenerator
+    attr_accessor :claim_code
+
+    def configure
+      if File.file?(CERTIFICATE_PATH) || File.file?(ACCESS_PATH)
+        puts "***************************** WARNING *****************************"
+        puts "The Deploy agent has already been configured. Are you sure you wish"
+        puts "to remove the existing configuration and generate a new one?"
+        puts
+
+        response = ask("Remove existing configuration? [no]: ")
+        Process.exit(1) unless response == 'yes'
+        puts
+      end
+
+      generate_certificate
+      generate_access_list
+
+      puts
+      puts "You can now associate this Agent with your Deploy account."
+      puts "Browse to Settings -> Agents in your account and enter the code below:"
+      puts
+      puts " >> #{claim_code} <<"
+      puts
+      puts "You can start the agent using the following command:"
+      puts
+      puts " # deploy-agent start"
+      puts
+    end
+
+    def generate_certificate
+      puts 'This tool will assist you in generating a certificate for your Deploy agent.'
+      puts 'Please enter a name for this agent.'
+
+      name = ask("Agent Name: ")
+      if name.length < 2
+        puts "Name must be at least 2 characters."
+        Process.exit(1)
+      else
+        uri = certificate_uri
+        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+          request = Net::HTTP::Post.new(uri)
+          request.body = {:name => name}.to_json
+          request['Content-Type'] = 'application/json'
+          response = http.request request
+          response_hash = JSON.parse(response.body)
+          if response_hash['status'] == 'success'
+            self.claim_code = response_hash['data']['claim_code']
+
+            File.write(CERTIFICATE_PATH, response_hash['data']['certificate'])
+            File.write(KEY_PATH,         response_hash['data']['private_key'])
+            puts
+            puts "Certificate has been successfully generated and installed."
+            puts
+          else
+            puts
+            puts "An error occurred obtaining a certificate."
+            puts "Please contact support, quoting the debug information below:"
+            puts
+            puts response.inspect
+            puts response.body
+            puts
+            Process.exit(1)
+          end
+        end
+      end
+    end
+
+    def generate_access_list
+      puts "By default this utility only allows connections from DeployHQ to localhost."
+      puts "To to deploy to other hosts or networks enter their addresses below:\n"
+
+      user_hosts = []
+      loop do
+        host = ask("IP Address [leave blank to finish]: ")
+        if host.empty?
+          break
+        else
+          user_hosts << host
+        end
+      end
+
+      begin
+        access_list = File.open(ACCESS_PATH, 'w')
+
+        # Add header and localhost entries
+        access_list.write("# This file contains a list of host and network addresses the Deploy agent\n# will allow connections to. Add IPs or networks (CIDR format) as needed.\n\n# Allow deployments to localhost\n127.0.0.1\n::1\n")
+
+        # Add user entries (if any)
+        access_list.write("\n# User defined destinations\n")
+        user_hosts.each do |host|
+          access_list.write("#{host}\n")
+        end
+      ensure
+        access_list.close if access_list
+      end
+    end
+
+    private
+
+    def ask(question)
+      Readline.completion_proc = Proc.new {}
+      Readline.readline(question, true)
+    rescue Interrupt => e
+      puts
+      Process.exit(1)
+    end
+
+    def certificate_uri
+      URI(ENV['DEPLOY_AGENT_CERTIFICATE_URL'] || 'https://api.deployhq.com/api/v1/agents/create')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploy-agent
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - aTech Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 description: This gem allows you to configure a secure proxy through which Deploy
   can forward connections
 email:
@@ -65,8 +79,8 @@ files:
 - ca.crt
 - lib/deploy_agent.rb
 - lib/deploy_agent/agent.rb
-- lib/deploy_agent/certificate_manager.rb
 - lib/deploy_agent/cli.rb
+- lib/deploy_agent/configuration_generator.rb
 - lib/deploy_agent/destination_connection.rb
 - lib/deploy_agent/server_connection.rb
 homepage: https://www.deployhq.com/
@@ -88,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The Deploy agent

data/lib/deploy_agent/certificate_manager.rb

@@ -1,88 +0,0 @@
-gem 'rb-readline', '0.5.4'
-require 'readline'
-require 'net/https'
-require 'json'
-require 'fileutils'
-
-module DeployAgent
-  class CertificateManager
-
-    def certificate_uri
-      URI(ENV['DEPLOY_AGENT_CERTIFICATE_URL'] || 'https://api.deployhq.com/api/v1/agents/create')
-    end
-
-    def generate_certificate
-      FileUtils.mkdir_p(CONFIG_PATH)
-      unless File.file?(ACCESS_PATH)
-        File.write(ACCESS_PATH, "# This file contains a list of host and network addresses the Deploy agent\n # will allow connections to. Add IPs or networks (CIDR format) as needed.\n\n# Allow deployments to localhost\n127.0.0.1\n::1\n")
-      end
-
-      puts 'This tool will assist you in generating a certificate for your Deploy agent.'
-      puts
-      if File.file?(CERTIFICATE_PATH)
-        puts "***************************** WARNING *****************************"
-        puts "The Deploy agent has already been configured. Are you sure you wish"
-        puts "to remove the existing certificate and generate a new one?"
-        puts
-        Readline.completion_proc = Proc.new {}
-        begin
-          response = Readline.readline("Remove existing certificate? [no]: ", true)
-        rescue Interrupt => e
-          puts
-          Process.exit(1)
-        end
-        unless response == 'yes'
-          Process.exit(1)
-        end
-        puts
-      end
-      puts 'Please enter a name for this agent.'
-      Readline.completion_proc = Proc.new {}
-      begin
-        name = Readline.readline("Agent Name: ", true)
-      rescue Interrupt => e
-        puts
-        Process.exit(1)
-      end
-      if name.length < 2
-        puts "Name must be at least 2 characters."
-        Process.exit(1)
-      else
-        uri = certificate_uri
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-          request = Net::HTTP::Post.new(uri)
-          request.body = {:name => name}.to_json
-          request['Content-Type'] = 'application/json'
-          response = http.request request
-          response_hash = JSON.parse(response.body)
-          if response_hash['status'] == 'success'
-            File.write(CERTIFICATE_PATH, response_hash['data']['certificate'])
-            File.write(KEY_PATH,         response_hash['data']['private_key'])
-            puts
-            puts "Certificate has been successfully generated and installed."
-            puts
-            puts "You can now associate this Agent with your Deploy account."
-            puts "Browse to Settings -> Agents in your account and enter the code below:"
-            puts
-            puts " >> #{response_hash['data']['claim_code']} <<"
-            puts
-            puts "You can start the agent using the following command:"
-            puts
-            puts " # deploy-agent start"
-            puts
-          else
-            puts
-            puts "An error occurred obtaining a certificate."
-            puts "Please contact support, quoting the debug information below:"
-            puts
-            puts response.inspect
-            puts response.body
-            puts
-            Process.exit(1)
-          end
-        end
-      end
-    end
-
-  end
-end