directlink 0.0.1.1 → 0.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb866e5434320eaffc9fd5710d3bde5e545a839
-  data.tar.gz: b40150fd4692b0bd37dda34d4af95e7384300bc6
+  metadata.gz: 9a8470c30310de349800459f325c2d244075fba2
+  data.tar.gz: fe0a118c8bb52d675325ce8d3356bb8fa7ca936f
 SHA512:
-  metadata.gz: 68365c9e4c1877461d38208949d90bf028f3d39857799bf8a53071f7ddf31cd01bb70351f91b88afe5ab81d016254d56d7d600c0483979fccc717f7743c0444a
-  data.tar.gz: 75ac07d1012bc49508e296ba77f3a134218c9ae8f2cf5640cee5097916a26220dedc91df6c918a8e3b8bfb49cb37f3d44ac2dbe77602014ab92b5981982b277d
+  metadata.gz: 60db6a81f31ba3a0425db1bf74d6719e852a6710fb716a081817ae9eaa8482f923b1ec1a5cb5f9dbf1d265e3599807c090a0e949e53ab568def36af7c6ffb53f
+  data.tar.gz: 693fab788a1c312f3cf42843e5029d4f40db50127da55034160ff9a607ac4002a57371632df3b24e0aa82f4ce1aaf4d5f00e83cd0589ff6f573ced8fab28b7c1

data/bin/directlink

@@ -31,7 +31,7 @@ if github
     dir = Dir.mktmpdir "directlink"
     src = File.join dir, "directlink.rb"
     puts "downloaded directlink.rb from GitHub (#{
-      File.write src, NetHTTPUtils.request_data("https://github.com/nakilon/directlink/blob/master/lib/directlink.rb", form: {raw: true})
+      File.write src, NetHTTPUtils.request_data("https://raw.githubusercontent.com/nakilon/directlink/master/lib/directlink.rb", form: {raw: true})
     } bytes)"
     require_relative src
   ensure
@@ -43,7 +43,13 @@ else
   require "directlink"
 end
 DirectLink.silent = !debug
-abort "usage: directlink [--debug] [--json] <link1> <link2> <link3> ..." if [nil, "-h", "--help"].include? ARGV.first
+abort "usage: directlink [--debug] [--json] <link1> <link2> <link3> ...\n#{
+        if github
+          "impossible to tell version for sure from raw.githubusercontent.com"
+        else
+          "directlink version #{Gem.loaded_specs["directlink"].version} (#{Gem.loaded_specs["directlink"].metadata["source_code_uri"]})"
+        end
+      }" if [nil, "-h", "--help", "-v", "--version"].include? ARGV.first
 
 begin
   if json

data/directlink.gemspec

@@ -1,12 +1,13 @@
 Gem::Specification.new do |spec|
   spec.name         = "directlink"
-  spec.version      = "0.0.1.1"
+  spec.version      = "0.0.1.2"
   spec.summary      = "converts any kind of image hyperlink to direct link, type of image and its resolution"
 
   spec.author       = "Victor Maslov aka Nakilon"
   spec.email        = "nakilon@gmail.com"
   spec.license      = "MIT"
   spec.homepage     = "https://github.com/nakilon/directlink"
+  spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/directlink"}
 
   spec.add_dependency "nethttputils", "~>0.2.2.0"
   spec.add_dependency "fastimage", "~>2.1.3"

data/test.rb

@@ -304,17 +304,24 @@ describe DirectLink do
 
     describe "shows usage help if misused" do
       [
-        ["usage: directlink [--debug] [--json] <link1> <link2> <link3> ...\n", nil],
-        ["usage: directlink [--debug] [--json] <link1> <link2> <link3> ...\n", "--help"],
-        ["usage: directlink [--debug] [--json] <link1> <link2> <link3> ...\n", "-h"],
+        [/\Ausage: directlink \[--debug\] \[--json\] <link1> <link2> <link3> \.\.\.\ndirectlink version \d\.\d\.\d\.\d \(https:\/\/github\.com\/nakilon\/directlink\)\n\z/, nil],
+        [/\Ausage: directlink \[--debug\] \[--json\] <link1> <link2> <link3> \.\.\.\ndirectlink version \d\.\d\.\d\.\d \(https:\/\/github\.com\/nakilon\/directlink\)\n\z/, "-h"],
+        [/\Ausage: directlink \[--debug\] \[--json\] <link1> <link2> <link3> \.\.\.\ndirectlink version \d\.\d\.\d\.\d \(https:\/\/github\.com\/nakilon\/directlink\)\n\z/, "--help"],
+        [/\Ausage: directlink \[--debug\] \[--json\] <link1> <link2> <link3> \.\.\.\ndirectlink version \d\.\d\.\d\.\d \(https:\/\/github\.com\/nakilon\/directlink\)\n\z/, "-v"],
+        [/\Ausage: directlink \[--debug\] \[--json\] <link1> <link2> <link3> \.\.\.\ndirectlink version \d\.\d\.\d\.\d \(https:\/\/github\.com\/nakilon\/directlink\)\n\z/, "--version"],
         ["DirectLink::ErrorBadLink: \"--\"\n", "--"],
         ["DirectLink::ErrorBadLink: \"-\"\n", "-"],
         ["DirectLink::ErrorBadLink: \"-\"\n", "- -"],
         ["DirectLink::ErrorBadLink: \"asd\"\n", "asd"],
-      ].each_with_index do |(expected_output, param), i|
+      ].each_with_index do |(expectation, param), i|
         it "##{i + 1}" do
-          string, status = Open3.capture2e "ruby -Ilib bin/directlink #{param}"
-          assert_equal [1, expected_output], [status.exitstatus, string]
+          string, status = Open3.capture2e "bundle exec ruby bin/directlink #{param}"
+          if expectation.is_a? String
+            assert_equal expectation, string
+          else
+            assert_match expectation, string
+          end
+          assert_equal 1, status.exitstatus
         end
       end
     end
@@ -332,7 +339,7 @@ describe DirectLink do
         [1, "https://imgur.com/a/badlinkpattern", "NetHTTPUtils::Error: HTTP error #404 "],
       ].each_with_index do |(expected_exit_code, link, expected_output, unset), i|
         it "##{i + 1}" do
-          string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip}#{unset} && ruby -Ilib bin/directlink #{link}"
+          string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip}#{unset} && bundle exec ruby bin/directlink #{link}"
           assert_equal [expected_exit_code, "#{expected_output}\n"], [status.exitstatus, string], "for #{link}"
         end
       end
@@ -375,7 +382,7 @@ describe DirectLink do
         '.gsub(/^ {8}/, ""), "json"],
     ].each do |expected_output, param|
       it "#{param || "default"} succeeds" do
-        string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip} && ruby -Ilib bin/directlink#{" --#{param}" if param} #{valid_imgur_image_url1} #{valid_imgur_image_url2}"
+        string, status = Open3.capture2e "export #{File.read("api_tokens_for_travis.sh").gsub(/\n?export/, ?\s).strip} && bundle exec ruby bin/directlink#{" --#{param}" if param} #{valid_imgur_image_url1} #{valid_imgur_image_url2}"
         assert_equal [0, expected_output], [status.exitstatus, string]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: directlink
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
@@ -73,7 +73,8 @@ files:
 homepage: https://github.com/nakilon/directlink
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/nakilon/directlink
 post_install_message: 
 rdoc_options: []
 require_paths: