datapimp 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f92a9f500550b9bf611651ec9269f1f1022b50aa
-  data.tar.gz: 8513b18bb3c76b1ea20e3eb91d532f8f37976994
+  metadata.gz: fe14e7bc0d6be32f769b6fac511147dc2cef501d
+  data.tar.gz: 470fdf3998730258b25faec69bffca68b7db465d
 SHA512:
-  metadata.gz: c59ce1165293766f89ed019f6862e39cfc8097c39efe7e152918b512a88605197b8aaa3dcee138655bb1ba42a6f7610a13b45692f6f2ee56886bb83fba59d0ed
-  data.tar.gz: 761f03f731d979fdae3760884eb5954c8f4b0de1179a71d85bb3577b04abbde1693ee076c6aeda3de1159a68046a73504e816619b4994ee2c20b7a74acd66cf7
+  metadata.gz: 15440f01cee38dd52a4256c73796302a0ffd732de8c5b42dd43f2531c3794e8ff12ed1f078146dc660718b5fd575b7ce09d90d0546192bb93ed3ae32763fc8e0
+  data.tar.gz: 2ba18490dac8bc77d4ccc57eb76482c87ad8381f3e7ec21ff9e00a823197af66c0ba6ecaddf1599aa7bca8ed773dd99d8bc5acee41ca482040908ed25b804118

data/bin/datapimp

@@ -1,16 +1,11 @@
 #!/usr/bin/env ruby
 
-begin
-  require "bundler"
-  Bundler.require
-rescue
-  require "rubygems"
-end
-
-$:.unshift Pathname(File.dirname(__FILE__)).join("..","lib")
+require "rubygems"
+require "bundler"
 
 require "pathname"
 require "pry"
+require "hashie"
 require "commander/import"
 require 'datapimp'
 require 'datapimp/cli'

data/lib/datapimp/configuration.rb

@@ -32,6 +32,10 @@ module Datapimp
       google_access_token: ''
     }
 
+    def current(using_environment = true)
+      @current ||= calculate_config(using_environment)
+    end
+
     def self.method_missing(meth, *args, &block)
       if instance.respond_to?(meth)
         return instance.send meth, *args, &block
@@ -123,13 +127,14 @@ module Datapimp
       DefaultSettings.dup
     end
 
-    def current(using_environment = true)
-      @current ||= calculate_config(using_environment)
-    end
-
     def calculate_config(using_environment = true)
       @current = defaults.merge(home_config.merge(cwd_config.merge(applied_config))).to_mash
 
+      if ENV['DATAPIMP_CONFIG_EXTRA'].to_s.length > 0
+        extra_config = Datapimp::Util.load_config_file(ENV['DATAPIMP_CONFIG_EXTRA'])
+        @current.merge!(extra_config) if extra_config.is_a?(Hash)
+      end
+
       (defaults.keys + home_config.keys + cwd_config.keys).uniq.each do |key|
         upper = key.to_s.upcase
         if ENV[upper]

data/lib/datapimp/logging.rb

@@ -1,3 +1,4 @@
+require 'logger'
 module Datapimp
   module Logging
     def log(*args)

data/lib/datapimp/sync/s3_bucket.rb

@@ -73,6 +73,7 @@ module Datapimp
       end
 
       def run_push_action(options={})
+        require 'rack' unless defined?(::Rack)
         entries = Dir[local_path.join('**/*')].map(&:to_pathname)
         prepare_manifest_for(entries)
 
@@ -90,19 +91,22 @@ module Datapimp
             next
           end
 
+          content_type = Rack::Mime.mime_type(File.extname(destination.split("/").last))
+
           if existing = s3.files.get(destination)
             if existing.etag == fingerprint
               log "Skipping #{ destination }: similar etag"
             else
               existing.body = entry.read
               existing.acl = 'public-read'
-              log "Updated #{ destination }"
+              existing.content_type = content_type
+              log "Updated #{ destination }; content-type: #{ content_type }"
               uploaded << destination
               existing.save
             end
           else
-            log "Uploaded #{ destination }"
-            s3.files.create(key: destination, body: entry.read, acl: 'public-read')
+            log "Uploaded #{ destination }; content-type: #{ content_type }"
+            s3.files.create(key: destination, body: entry.read, acl: 'public-read', content_type: content_type)
             uploaded << destination
           end
 

data/lib/datapimp/util.rb

@@ -0,0 +1,16 @@
+module Datapimp
+  module Util
+    def self.load_config_file(at_path)
+      at_path = Pathname(at_path)
+      extension = at_path.extname.to_s.downcase
+
+      raise 'No config file exists at: ' + at_path.to_s unless at_path.exist?
+
+      if extension == '.yml' || extension == '.yaml'
+        YAML.load_file(at_path)
+      elsif extension == '.json'
+        JSON.parse(at_path.read)
+      end
+    end
+  end
+end

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -409,6 +409,7 @@ files:
 - lib/datapimp/sync/dropbox_folder.rb
 - lib/datapimp/sync/google_drive_folder.rb
 - lib/datapimp/sync/s3_bucket.rb
+- lib/datapimp/util.rb
 - lib/datapimp/version.rb
 - packaging/wrapper.sh
 - spec/spec_helper.rb
@@ -444,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A collection of API development patterns that I have accumulated in my career
@@ -452,3 +453,4 @@ summary: A collection of API development patterns that I have accumulated in my
 test_files:
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
+has_rdoc: