hako-switch-hitter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a493b68c2779e1afdf0e2fc80420bb2ae1dc3ca8
-  data.tar.gz: 789bda97be8d7a8bfad32f31805ce38c74f85b13
+  metadata.gz: 37f7ab335173996bb8584be366b43d2c411ace4d
+  data.tar.gz: bb2b85f6635a6d62ac79d37dafb97aca5230d5b5
 SHA512:
-  metadata.gz: 95e2b17ba7ab22146d3bfecf5d5148b61192702caeda8e64ca00e6a4c9230adaef45851373c3c8d5f040b8b7b01db1be927088fa6851163ff03f41946d9d2570
-  data.tar.gz: d6121e4a3c8ef75972c19dc70636aab3b6b14aab0bfc8855a0018be397a4c22cd287506e04bc2c5c9a51afea8c8a835c9fc1dbc0e0dfb306daccf609c843c820
+  metadata.gz: 7f5184c9b4c3b44abc1314d651a6cac48cf7c69a0e15d6b3d1d7ead2bf9a592404dadd2ec0516ced997230b801aa46f2c33fceca8a5f34c62a309df1e50a3237
+  data.tar.gz: c107ccd15a09c97254672c12cf6e4092ef7b2112858fafedb5735cc30acb3dca78ac8c84c7edf089d62ab90a768af83e17d725b6f0a0a43984ad611e41c1bc09

data/README.md

@@ -1,4 +1,6 @@
-# Hako::Switch::Hitter
+# Hako::SwitchHitter
+
+[![Build Status](https://travis-ci.org/wata-gh/hako-switch-hitter.svg)](https://travis-ci.org/wata-gh/hako-switch-hitter)
 
 Hit endpoint at [hako](https://github.com/eagletmt/hako) script deploy_finished.
 
@@ -23,22 +25,9 @@ Or install it yourself as:
 ```yaml
 scripts:
   - type: switch_hitter
-    endpoint:
-      proto: http
-      host: example.com
-      port: 10080
-      path: /switch_endpoint
+    endpoint: https://example.com/switch_endpoint
 ```
 
-config | detail | required
---- | --- | ---
-proto | http or https | true
-host | example.com | true
-port | 80 | false
-path | /switch_endpoint | true
-
-If `port` is not configured, hako-switch-hitter will 80 for http and 443 for https.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/hako-switch-hitter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hako-switch-hitter'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['wata']
   spec.email         = ['wata.gm@gmail.com']
 

data/lib/hako/scripts/switch_hitter.rb

@@ -2,6 +2,7 @@ require 'hako'
 require 'hako/error'
 require 'hako/script'
 require 'net/http'
+require 'uri'
 
 module Hako
   module Scripts
@@ -28,31 +29,30 @@ module Hako
         @options['endpoint']
       end
 
-      # @return [String]
-      def endpoint_proto
-        proto = endpoint.fetch('proto')
-        raise Error.new("Switch hitter proto must be http or https") unless %w/http https/.include?(proto)
-        proto
+      # @return [URI]
+      def endpoint_uri
+        @uri ||= URI.parse(endpoint)
       end
 
       # @return [String]
-      def endpoint_host
-        endpoint.fetch('host')
+      def endpoint_scheme
+        raise Error.new("Switch hitter endpoint scheme must be http or https") unless %w/http https/.include?(endpoint_uri.scheme)
+        endpoint_uri.scheme
       end
 
-      # @return [Fixnum]
-      def wellknown_port
-        endpoint_proto == 'https' ? 443 : 80
+      # @return [String]
+      def endpoint_host
+        endpoint_uri.host
       end
 
       # @return [Fixnum]
       def endpoint_port
-        endpoint.fetch('port', wellknown_port)
+        endpoint_uri.port
       end
 
       # @return [String]
       def endpoint_path
-        endpoint.fetch('path')
+        endpoint_uri.path
       end
 
       # @return [Net::HTTP]
@@ -60,32 +60,25 @@ module Hako
         Net::HTTP.new(host, port)
       end
 
-      # @return [String]
-      def url
-        "#{endpoint_proto}://#{endpoint_host}:#{endpoint_port}#{endpoint_path}"
-      end
-
       # @return [nil]
       def hit_switch
-        net_http = http(endpoint_host, endpoint_port)
+        Hako.logger.info("Switch endpoint #{endpoint}")
 
-        Hako.logger.info("Switch endpoint #{url}")
-        if endpoint_proto == 'HTTPS'
-          net_http.use_ssl = true
-        end
+        net_http = http(endpoint_host, endpoint_port)
+        net_http.use_ssl = endpoint_scheme == 'https'
 
         if @dry_run
-          Hako.logger.info("Switch hitter will request #{url} [dry-run]")
+          Hako.logger.info("Switch hitter will request #{endpoint} [dry-run]")
           return
         end
 
         net_http.start do
-          req = Net::HTTP::Get.new(endpoint_path)
+          req = Net::HTTP::Get.new(endpoint_uri.request_uri)
           res = net_http.request(req)
           unless res.code == '200'
             raise Error.new("Switch hitter HTTP Error: #{res.code}: #{res.body}")
           end
-          Hako.logger.info("Enabled #{endpoint_path} at #{res.body}")
+          Hako.logger.info("Enabled #{endpoint} at #{res.body}")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako-switch-hitter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - wata