Merge branch 'release/0.3.0'

snowplow-archive · Jul 5, 2016 · c658b30 · c658b30
2 parents f696835 + b7271b6
commit c658b30
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,17 @@
 language: ruby
 cache: bundler
 
+before_install:
+- gem install bundler -v 1.12.5
+
 rvm:
   - 1.9.3
   - jruby
   - 2.0.0
   - 2.1.0
 
 script: 'bundle exec rspec spec'
+
+sudo: false
+
+bundler_args: --verbose
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+Version 0.3.0 (2016-07-05)
+--------------------------
+Update Bundler version in Travis (#45)
+Bump Fog to 1.25.0 (#30)
+Bump Contracts to 0.9 (#37)
+Add runtime dependency on net-ssh to Gemspec (#44)
+Remove guard and guard-rspec gems from Gemspec (#43)
+Move `include Contracts` inside modules and classes (#40)
+
 Version 0.2.2 (2015-04-08)
 --------------------------
 Stuck Fog dependency to version 1.24 to prevent AWS Regions issue, thanks @epantera! (#33)

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Sluice has been extracted from a pair of Ruby ETL applications built by the [Sno
 
 Or in your Gemfile:
 
-    gem 'sluice', '~> 0.2.2'
+    gem 'sluice', '~> 0.3.0'
 
 ## Usage
 

diff --git a/lib/sluice/storage/s3/contracts.rb b/lib/sluice/storage/s3/contracts.rb
@@ -17,12 +17,13 @@
 require 'fog/aws/models/storage/file'
 
 require 'contracts'
-include Contracts
 
 module Sluice
   module Storage
     module S3
 
+      include Contracts
+
       # Aliases for Contracts
       FogStorage = Fog::Storage::AWS::Real
       FogFile = Fog::Storage::AWS::File

diff --git a/lib/sluice/storage/s3/location.rb b/lib/sluice/storage/s3/location.rb
@@ -14,7 +14,6 @@
 # License::   Apache License Version 2.0
 
 require 'contracts'
-include Contracts
 
 module Sluice
   module Storage
@@ -25,6 +24,8 @@ module S3
       # buckets, maybe we should make that clearer?
       class Location
 
+        include Contracts
+
         attr_reader :bucket, :dir
 
         # Location constructor

diff --git a/lib/sluice/storage/s3/manifest.rb b/lib/sluice/storage/s3/manifest.rb
@@ -16,7 +16,6 @@
 require 'set'
 
 require 'contracts'
-include Contracts
 
 module Sluice
   module Storage
@@ -45,6 +44,9 @@ def self.valid?(val)
 
       # Class to read and maintain a manifest.
       class Manifest
+
+        include Contracts
+
         attr_reader :s3_location, :scope, :manifest_file
 
         # Manifest constructor

diff --git a/lib/sluice/storage/s3/s3.rb b/lib/sluice/storage/s3/s3.rb
@@ -19,12 +19,13 @@
 require 'timeout'
 
 require 'contracts'
-include Contracts
 
 module Sluice
   module Storage
     module S3
 
+      include Contracts
+
       # TODO: figure out logging instead of puts (https://github.com/snowplow/sluice/issues/2)
       # TODO: consider moving to OO structure (https://github.com/snowplow/sluice/issues/3)
 

diff --git a/lib/sluice/version.rb b/lib/sluice/version.rb
@@ -15,5 +15,5 @@
 
 module Sluice
   NAME    = "sluice"
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end
diff --git a/sluice.gemspec b/sluice.gemspec
@@ -35,12 +35,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   # Dependencies
-  gem.add_dependency 'contracts', '~> 0.4'
-  gem.add_dependency 'fog', '1.24'
+  gem.add_dependency 'contracts', '~> 0.9'
+  gem.add_dependency 'fog', '1.25'
+
+  gem.add_runtime_dependency 'net-ssh', '~> 2.9.2'
 
   gem.add_development_dependency "rspec", "~> 2.14", ">= 2.14.1"
   gem.add_development_dependency "rspec-nc"
-  gem.add_development_dependency "guard"
-  gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency "coveralls"
 end