datahunter 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9919f3ad7ae09cbb6e8c15d69ad969b6a7d540f
-  data.tar.gz: 3ab09545715106aa731338edb0bbb5803d8956e5
+  metadata.gz: 3c02fdbf540a9f74a6060e397e0e974473b25964
+  data.tar.gz: edad9aff2f8ea61dd994b29049544f8c10a831d5
 SHA512:
-  metadata.gz: 06a00c3e9c22884397dcb87563ffeb603e0dd2c382f0e3723a9825d9dbe449b0f1e14d93856a14b72269c1030e24fb2880c81af42691e7aea748752868108296
-  data.tar.gz: 367e8b39398dd88bff9d00d6859ca1ef5aeec44b87393670dff8e1363f62c9b3ad53b18febbcb7acf21d18c8a8cb312313425a776f54b126b008ce9bb7c15078
+  metadata.gz: ce6db1a7c75a00cb9479f362998cb5b072b28601dc4f5e0cefe182db2804c4882f01ff0bd87a589374e6b3b77d029eef39b3b1938ba43ae2a374e456e0a96447
+  data.tar.gz: b1e90694f9d6b40e4d87ebe254962a993ebe48ad56eb19ebe7f88524c6428bcfd990101325de6bfc7c1130a82f7f22b6e977bbb6d899171a0cc4c62cd6ca7a89

data/.gitignore

@@ -5,6 +5,7 @@
 /coverage/
 /doc/
 /pkg/
+/packaging/
 /spec/reports/
 /tmp/
 *.bundle

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require 'bundler/setup'
 require 'rspec/core/rake_task'
 
 # Default directory to look in is `/specs`
@@ -7,4 +8,81 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   task.rspec_opts = ['--color', '--format documentation']
 end
 
-task :default => :spec
+task :default => :spec
+
+PACKAGE_NAME = "datahunter"
+VERSION = Datahunter::VERSION
+TRAVELING_RUBY_VERSION = "20150210-2.1.5"
+
+desc "Package your app"
+task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx']
+
+namespace :package do
+  namespace :linux do
+    desc "Package Hunter for Linux x86"
+    task :x86 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
+      create_package("linux-x86")
+    end
+    
+    desc "Package Hunter for Linux x86_64"
+    task :x86_64 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
+      create_package("linux-x86_64")
+    end
+  end
+  
+  desc "Package your app for OS X"
+  task :osx => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
+    create_package("osx")
+  end
+  
+  desc "Install gems to local directory"
+  task :bundle_install do
+    if RUBY_VERSION !~ /^2\.1\./
+      abort "Only ruby 2.1"
+    end
+    sh "rm -rf packaging/tmp"
+    sh "mkdir -p packaging/tmp"
+    sh "cp datahunter.gemspec Gemfile.lock packaging/tmp/"
+    Bundler.with_clean_env do
+      sh "cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path packaging/vendor"
+    end
+    sh "rm -rf packaging/tmp"
+#    sh "rm -f packaging/vendor/*/*/cache/*"
+  end
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime("linux-x86")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime("linux-x86_64")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime("osx")
+end
+
+def create_package(target)
+  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+  sh "rm -rf #{package_dir}"
+  sh "mkdir #{package_dir}"
+  sh "mkdir -p #{package_dir}/lib/app"
+  sh "cp bin/hunter bin/datahunter #{package_dir}/lib/app"
+  sh "mkdir #{package_dir}/lib/ruby"
+  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  sh "cp packaging/wrapper.sh #{package_dir}/hunter"
+  sh "cp -pR packaging/vendor #{package_dir}/lib/"
+  sh "cp datahunter.gemspec Gemfile.lock #{package_dir}/lib/vendor/"
+  sh "mkdir #{package_dir}/lib/vendor/.bundle"
+#  sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
+  if !ENV['DIR_ONLY']
+    sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    sh "rm -rf #{package_dir}"
+  end
+end
+
+def download_runtime(target)
+  sh "cd packaging && curl -L -O --fail " +
+    "http://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+end

data/bin/hunter

@@ -44,7 +44,7 @@ command :find do |c|
           
             Datahunter.print_coll_of_datasets_info_light sub_datasets
             
-            case ask "### GET A DATASET ? (1/..5), show next 5 datasets? (RET) or abort? (abort)".colorize(:yellow)
+            case ask ("### Get dataset ? (1/..5), next 5 datasets? (RET) or abort? (abort)".colorize(:yellow))
             when '1'
               Datahunter.get_dataset sub_datasets[0]
               break

data/datahunter.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "aruba-rspec"
     
   spec.add_runtime_dependency "json", "~> 1.8.1"
-  spec.add_runtime_dependency "commander", "~> 4.3.0"
-  spec.add_runtime_dependency "rest-client", "~> 1.7.3"
+  spec.add_runtime_dependency "commander", "~> 4.3.1"
+  spec.add_runtime_dependency "rest-client", "~> 1.8.0"
   spec.add_runtime_dependency "launchy", "~> 2.4.3"
   spec.add_runtime_dependency "colorize", "~> 0.7.5"
   spec.add_runtime_dependency "downloadr", "0.0.41"
-  spec.add_runtime_dependency "addressable", "~> 2.3.7"
+  spec.add_runtime_dependency "addressable", "~> 2.3.8"
 end

data/lib/datahunter/version.rb

@@ -1,3 +1,3 @@
 module Datahunter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/hunter_spec.rb

@@ -1,9 +1,32 @@
 require 'spec_helper'
+require 'launchy'
+require 'downloadr'
+require 'addressable/uri'
 
-describe 'Hunter CLI' do
+describe 'Hunter' do
 
+  before(:each) do
+    @datasets = [{"description"=>"Comparison of developments in GDP", "created-ds"=>"2015-02-21T18:04:50.831Z", "tags"=>["labour", "gdp", "market", "the"], "_id"=>"54e8c8c2a8268b5c235ac62f", "publisher"=>"Office for National Statistics", "updated"=>"2015-02-18T09:22:22.556Z", "created"=>"2011-12-11T11:39:23.142Z", "spatial"=>["england", "scotland"], "title"=>"GDP and the Labour Market", "modified-ds"=>"2015-02-21T18:04:50.831Z", "uri"=>"URI Not Available", "huntscore"=>5.0, "resources"=>[{"title"=>"GDP and the Labour Market", "url"=>"http://webarchive.nationalarchives.gov.uk228166.xml", "format"=>""}, {"title"=>"GDP and the Labour Market", "url"=>"http://www.ons.gov.uk/ons/dcp19975_228158.xml", "format"=>""}], "temporal"=>["2011", "2012"]},
+{"description"=>"Regional Gross Value Added (GVA)", "created-ds"=>"2015-02-21T18:06:09.304Z", "tags"=>["gross", "regional"], "_id"=>"54e8c911a8268b5c235ac855", "publisher"=>"Office for National Statistics", "updated"=>"2014-12-18T10:19:46.273Z", "created"=>"2013-12-19T09:29:03.755Z", "spatial"=>["england", "scotland"], "title"=>"Regional Gross Value Added (Production approach)", "modified-ds"=>"2015-02-21T18:06:09.304Z", "uri"=>"URI Not Available", "huntscore"=>5.0, "resources"=>[], "temporal"=>["2013", "2014"]}]
+
+    @url = "http://data.consumerfinance.gov/api/views.json"
+    @bad_url = "https://www.data.gouv.fr/fr/datasets/population/"
+    @invalid_url = "foo bar"
+  end
+
+  describe 'download a file' do
+    
+    it 'should raise an error with an invalid uri' do
+      lambda { Datahunter.download_file @invalid_url }.should   raise_error(Launchy::ApplicationNotFoundError) 
+    end    
+    
+    it 'should open the browser if the file extension is not acceptable' do
+      lambda { Datahunter.download_file @bad_url }.should_not raise_error
+      
+    end
     
-  it 'find command should be working' do
-  
+    it 'should ask if rename the file if the file extension is acceptable' do
+      lambda { Datahunter.download_file @url }.should raise_error(NoMethodError)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahunter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Terpo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 2.3.8
 description: Command line interface to find open datasets via the Hunter API
 email:
 - nicolas.terpolilli@gmail.com