caseblocks_bucket_extractor 0.0.4 → 0.0.5

data/bin/bucket_downloader

@@ -11,55 +11,56 @@ opts = Slop.parse do
 
   on 'casetype=', 'Case Type Name'
   on 'bucket=', 'Bucket Slug'
-  on 'username=', 'Username'
-  on 'password=', 'Password'
+  on 'url=', 'url to download from (default https://login.caseblocks.com)'
+  on 'token=', 'Authentication token for caseblocks api'
+  on 'relation_type=', 'Relation name to download, ie the name of the 1 to many (default domain)'
+  on 'path=', 'Path to safe file in'
+  on 'timeout=', "minutes to wait for download to complete (default 180)"
   on 'f', 'forcequotes', 'Force quotation marks'
-  on 'l', 'local', "Download from localhost"
 end
 
-if opts[:casetype] && opts[:bucket]
+if opts[:casetype] && opts[:bucket] && opts[:path] && opts[:token]
 
   # Bucket Downloader
   puts " == Bucket Downloader == "
   
   bucket_name = opts[:bucket]
   case_type = opts[:casetype]
+  retry_limit = (opts[:timeout] || 180).to_i
+  relation_type = opts[:relation_type] || "domain"
+  url = opts[:url] || "https://login.caseblocks.com"
   
-  puts "Downloading bucket: #{bucket_name}"
+  puts "Downloading bucket: #{bucket_name} from #{case_type}"
   
-  #Create instance of CaseblocksBucketExtractor passing URL, email and password with optional download_options i.e. {:retry_limit => 5,:time_between_retries => 5}
   puts "Creating Bucket Extractor... "
-  if opts[:local]
-    puts "http://localhost:3001"
-    bucket_extractor = CaseblocksBucketExtractor.new("http://localhost:3000", opts[:username], opts[:password], {:retry_limit => 12,:time_between_retries => 10})
-  else
-    bucket_extractor = CaseblocksBucketExtractor.new("https://login.caseblocks.com", opts[:username], opts[:password], {:retry_limit => 5,:time_between_retries => 5})
-  end
-  
-  #Setup file options array. :name -> will find extracted CSV file containing value, :path -> local file path to save file to
+  bucket_extractor = CaseblocksBucketExtractor.new(url, opts[:token], {:retry_limit => retry_limit,:time_between_retries => 60})
   
-  file_path = File.expand_path("..", __FILE__) + "/"+ DateTime.now.strftime("%y-%m-%d-%M-%H") + "_" + bucket_name + ".csv"
+  file_path = opts[:path] + "/"+ DateTime.now.strftime("%y-%m-%d-%M-%H") + "_" + bucket_name + ".csv"
   
-  file_options = [{:path => file_path, :name => "domain.csv"}]
+  file_options = [{:path => file_path, :name => "#{relation_type}.csv"}]
   
   puts "Downloading to #{file_path}"
   
   #Begin download specifying Case Type Name, bucket slug and the file options defined above
-  bucket_extractor.download(case_type, bucket_name, file_options)
+  begin
+    bucket_extractor.download(case_type, bucket_name, file_options)
 
-  if opts[:forcequotes]
-    puts "Forcing fields to have quotes"
+    if opts[:forcequotes]
+      puts "Forcing fields to have quotes"
 
-    CSV.open("#{file_path[0..-5]}.tmp", "w+", :force_quotes => true) do |tmp_csv|
-      puts "file_path: #{file_path}"
-      CSV.open(file_path, "r").each do |row|
-        tmp_csv << row
+      CSV.open("#{file_path[0..-5]}.tmp", "w+", :force_quotes => true) do |tmp_csv|
+        puts "file_path: #{file_path}"
+        CSV.open(file_path, "r").each do |row|
+          tmp_csv << row
+        end
       end
+      FileUtils.mv("#{file_path[0..-5]}.tmp", file_path)
     end
-    FileUtils.mv("#{file_path[0..-5]}.tmp", file_path)
+    
+    puts "End Bucket Downloader"
+  rescue => e
+    puts "Download has not completed successully: #{e.message}"
   end
-  
-  puts "End Bucket Downloader"
 else
   puts opts
 end

data/lib/caseblocks_bucket_extractor.rb

@@ -12,18 +12,12 @@ class CaseblocksBucketExtractor
   headers "Accept" => "application/json"
   headers "Content-Type" => "application/json"
 
-  def initialize(url, email, password, download_options={:retry_limit => 60,:time_between_retries => 60})
+  def initialize(url, auth_token, download_options={:retry_limit => 60,:time_between_retries => 60})
     self.class.base_uri url
 
-    result = self.class.post("/tokens", :body => {email: email, password: password}.to_json)
-
-    if result["message"]
-      puts "unable to generate token"
-      raise
-    else
-      @auth_token = result["token"] if result
-      self.class.default_params("auth_token" => @auth_token)
-    end
+    puts url
+    @auth_token = auth_token
+    self.class.default_params("auth_token" => @auth_token)
 
     @retry_limit = download_options[:retry_limit]
     @time_between_retries = download_options[:time_between_retries]
@@ -32,14 +26,15 @@ class CaseblocksBucketExtractor
   def download(case_type_name, bucket_slug, file_options)
     response = self.class.get("/case_blocks/#{URI::encode(case_type_name)}/buckets/#{bucket_slug}/schedule_download_job")
     job_url = get_job_url(response.body)
-    return if job_url.nil?
+
+    raise response.headers["status"] unless response.headers["status"].start_with?("200")
 
     result = start_polling(job_url)
 
     if !result.nil? && result["job"]["status"] == "complete"
       create_files(file_options,result)
     else
-      puts "!!!!!  Job - #{job_url} did not complete. !!!!!!"
+      raise "!!!!!  Job - #{job_url} did not complete. !!!!!!"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caseblocks_bucket_extractor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: