datahunter 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b92a3a0efd950fdcd7f7397b0eca1635874fd9
-  data.tar.gz: b0686678dd9d2ea28659492ab680986ec7afbf5d
+  metadata.gz: a339421a60af0ce4169a8ea2aaaa52303252a3d6
+  data.tar.gz: bf8bfb5220db28bf00ab4c3ef423d2e62162cd5a
 SHA512:
-  metadata.gz: 6423bfa343d397b4db64b5c130e598505a2140dfc067813f72dcd30a0355d136acb7b6c1f9e2f6668581a3acca9152f33232deb0c12962ad2761e244b732c78a
-  data.tar.gz: f1202c5aea77b21080c2e692da4416a7bd6e8c48a65a59a3c7cd3768252ead8f65fa88c9f38ea4b4effda1d6689683956419e01e1d454d4545a2e1200b1ad124
+  metadata.gz: 4f1fefb00bc70b63b2fc55292014724a8b8b23d25c6045a0da1d806d291942477097ab691b825f81920607f04f12657ee391f2cd814674a84c2f214f596e26cf
+  data.tar.gz: 1bc61fd641e7e2d5dafe45bfb6acda511b23c8b2c708cf777cd42dadc492be73530999e0feca5e353d141cf7b6f6f5435d094e6b6ee5357ed01a5990ead4c207

data/bin/hunter

@@ -10,7 +10,7 @@ require 'colorize'
 require 'downloadr'
 
 program :version, Datahunter::VERSION
-program :description, 'Find and download Open Datasets directly from your terminal'
+program :description, 'Find an download Open Datasets directly from your terminal'
 program :help_formatter, :compact
 
 command :find do |c|
@@ -53,11 +53,10 @@ command :find do |c|
             
             case ask "### get the data? (y/n)".colorize(:yellow)
             when 'y'
-              if datasets[index]["resources"].any?
+              if datasets[index].has_key?("resources")
                 Datahunter.download_the_data datasets[index]
               else
-                puts "You can't download this dataset directly, but you should from there"
-                Launchy.open(datasets[index]["uri"], options = {})
+                Datahunter.open_in_browser datasets[index]["uri"]
               end
               break
            
@@ -177,7 +176,11 @@ command :get do |c|
         when 200
           ds = JSON.parse(response.body)
           puts
-          Datahunter.download_the_data ds
+          if ds.has_key?("resources")
+            Datahunter.download_the_data ds
+          else
+            Datahunter.open_in_browser ds["uri"]
+          end
         when 500
           puts "Invalid ID".colorize(:red)
         end

data/lib/datahunter/base.rb

@@ -56,6 +56,15 @@ module Datahunter
     Datahunter.download_file(resources[dl]["url"], resources[dl]["format"], dataset["uri"])
   end
 
+  def self.open_in_browser url
+    if url =~ /\A#{URI::regexp}\z/
+      puts "You can't download this dataset directly, but you should from there"
+      Launchy.open(url, options = {})
+    else
+      Datahunter.print_bad_uri_message
+    end
+  end
+
 ## Messages: feedback and excuses
 
   def self.print_feedback_request
@@ -80,6 +89,11 @@ module Datahunter
          "if you just want to give us a feedback, don't hesitate!".colorize(:red)
   end
 
+  def self.print_bad_uri_message
+    puts "The URL given by the publisher is not valid. We'll try to find out why "\
+         "as soon as we can!".colorize(:red)
+  end
+
   private
   
   def self.print_downloadable_links resources

data/lib/datahunter/version.rb

@@ -1,3 +1,3 @@
 module Datahunter
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahunter
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Terpo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler