bard 0.64.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f618df3bbb634f25fcb5f03f81a68b733e2fd70d5a654b8e8f9e0733ce180849
-  data.tar.gz: 155060b90c13a3365bf3cd768642966bbc4926643b92d9f18378f69a9516df01
+  metadata.gz: 846754c2ad0d14dc0df687db107e05ecad69a9122540fba07b2362b83ff7b4a0
+  data.tar.gz: 04da3c9f2faa9d2d698d6d08442360a69bbe114e0333b6730257bc9b3ff18e35
 SHA512:
-  metadata.gz: f4e42669d831bdf57dc6749ca7443690a307d9abf048f1a1e0eecbfd33a7f53e0a94a4aa1bf78f3724054407f7e679f49fcac029cc1fa00199c7584e68c5301b
-  data.tar.gz: 7193a3c7324ee1da26262f18516f3a672299ccc29b1f1737eee7ad121c7cb992e7609fd271cc963b5f673285f9ec31f5c44074ae869f738264ba6ecd8b6749c8
+  metadata.gz: e742ede7bf2afc73dd8e68e60991ef1b13a819df55b0adea253b58ba70e5102a0139bdb26fcd10e2fe51574cd7a69262224484f6b6855794d930e57bd6739ab1
+  data.tar.gz: 17de7f6f053b646ccdf948197846f0890c2d765e86098a8b41b23d9063bfb376e16dd42bb912b7ad7ce65fc0fcfb84514b43fcac67dd187750f49d280f5c992e

data/lib/bard/config.rb

@@ -80,14 +80,26 @@ 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 == 0
+          (super() || [nil]).map(&method(:normalize_ping))
+        else
+          self.ping = args
+        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.first
         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
@@ -5,17 +8,29 @@ module Bard
     end
 
     def call
-      return true if server.ping == false
-
-      url = server.default_ping
-      if server.ping =~ %r{^/}
-        url += server.ping
-      elsif server.ping.to_s.length > 0
-        url = server.ping
+      server.ping.reject do |url|
+        next true if url == false
+        response = get_response_with_redirect(url) rescue nil
+        response.is_a?(Net::HTTPSuccess)
       end
+    end
 
-      command = "curl -sfL #{url} 2>&1 1>/dev/null"
-      system command
+    private
+
+    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.65.0"
 end
 

data/lib/bard.rb

@@ -138,7 +138,7 @@ class Bard::CLI < Thor
   def open server=nil
     server ||= @config.servers.key?(:production) ? :production : :staging
     server = @config.servers[server.to_sym]
-    exec "xdg-open #{server.default_ping}"
+    exec "xdg-open #{server.ping.first}"
   end
 
   desc "hurt", "reruns a command until it fails"
@@ -208,10 +208,9 @@ class Bard::CLI < Thor
   desc "ping [SERVER=production]", "hits the server over http to verify that its up."
   def ping server=:production
     server = @config.servers[server.to_sym]
-    unless Bard::Ping.call(server)
-      puts "#{server.key.to_s.capitalize} is down!"
-      exit 1
-    end
+    down_urls = Bard::Ping.call(server)
+    down_urls.each { |url| puts "#{url} is down!" }
+    exit 1 if down_urls.any?
   end
 
   desc "master_key --from=production --to=local", "copy master key from from to to"

metadata

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