bard 0.64.0 → 0.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f618df3bbb634f25fcb5f03f81a68b733e2fd70d5a654b8e8f9e0733ce180849
-  data.tar.gz: 155060b90c13a3365bf3cd768642966bbc4926643b92d9f18378f69a9516df01
+  metadata.gz: c9d061d17e01a9c194b56cbc5c86ed626e390048c939453f6af87a7b9a136f24
+  data.tar.gz: 89cbc27d550599e4a8c2eb5287969d19dafdb2176f37d0f65c606966d77542a8
 SHA512:
-  metadata.gz: f4e42669d831bdf57dc6749ca7443690a307d9abf048f1a1e0eecbfd33a7f53e0a94a4aa1bf78f3724054407f7e679f49fcac029cc1fa00199c7584e68c5301b
-  data.tar.gz: 7193a3c7324ee1da26262f18516f3a672299ccc29b1f1737eee7ad121c7cb992e7609fd271cc963b5f673285f9ec31f5c44074ae869f738264ba6ecd8b6749c8
+  metadata.gz: 468913ca2b377d72a317fa44c73a7602445f4a9479d260326be1044598feb727aa13a2d35bebd65d06120eb50ade5960e767ff292f664e602ad394f96a996130
+  data.tar.gz: d322765c29287237823708b6cb71887d8662445826e61d726c0acfd819526062ffec20a5e79a33f404f959969d8b45ecc9d70f21506f2f9312027c16eab85111

data/lib/bard/config.rb

@@ -80,14 +80,28 @@ module Bard
 
       setting :ssh, :path, :ping, :gateway, :ssh_key, :env
 
-      def default_ping
-        uri = URI.parse("ssh://#{ssh}")
-        "https://#{uri.host}"
+      def ping(*args)
+        if args.length == 1
+          self.ping = args.first
+        elsif args.length == 0
+          normalize_ping(super())
+        else
+          raise ArgumentError
+        end
       end
 
-      def normalized_ping
-        normalized = ping || default_ping
-        normalized = "https://#{normalized}" unless normalized =~ /^http/
+      private def normalize_ping value
+        return value if value == false
+        uri = URI.parse("ssh://#{ssh}")
+        normalized = "https://#{uri.host}" # default if none specified
+        if value =~ %r{^/}
+          normalized += value
+        elsif value.to_s.length > 0
+          normalized = value
+        end
+        if normalized !~ /^http/
+          normalized = "https://#{normalized}"
+        end
         normalized
       end
 

data/lib/bard/data.rb

@@ -3,7 +3,7 @@ class Bard::CLI < Thor
     def call
       if to == "production"
         server = bard.instance_variable_get(:@config).servers[to.to_sym]
-        url = server.normalized_ping
+        url = server.ping
         puts bard.yellow("WARNING: You are about to push data to production, overwriting everything that is there!")
         answer = bard.ask("If you really want to do this, please type in the full HTTPS url of the production server:")
         if answer != url

data/lib/bard/ping.rb

@@ -1,3 +1,6 @@
+require "net/http"
+require "uri"
+
 module Bard
   class Ping < Struct.new(:server)
     def self.call server
@@ -6,16 +9,26 @@ module Bard
 
     def call
       return true if server.ping == false
+      response = get_response_with_redirect(server.ping)
+      response.is_a?(Net::HTTPSuccess)
+    end
 
-      url = server.default_ping
-      if server.ping =~ %r{^/}
-        url += server.ping
-      elsif server.ping.to_s.length > 0
-        url = server.ping
-      end
+    private
 
-      command = "curl -sfL #{url} 2>&1 1>/dev/null"
-      system command
+    def get_response_with_redirect uri_str, limit=5
+      response = Net::HTTP.get_response(URI(uri_str))
+
+      case response
+      when Net::HTTPRedirection
+        if limit == 0
+          puts "too many HTTP redirects"
+          response
+        else
+          get_response_with_redirect(response["location"], limit - 1)
+        end
+      else
+        response
+      end
     end
   end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.64.0"
+  VERSION = "0.64.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.64.0
+  version: 0.64.1
 platform: ruby
 authors:
 - Micah Geisel