dandelion 0.3.14 → 0.3.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c3781548a13b84f08cd1f9b6424806e6e41df1a4
4
- data.tar.gz: d7c4cf472c7c29bbeb27bcaa7c037d96cc751b34
3
+ metadata.gz: 15da8ebaa65f3365b4aae08f6725564913aa4cba
4
+ data.tar.gz: 7f9ef8588e9f43540238e4204b149cf165f03602
5
5
  SHA512:
6
- metadata.gz: afc1751986ff30081ecf1f56c70f9cacc6c7213453baee1cddc0d44e3b5b589e3212aed673d6869c9b9a4a1da72c2054e927918069bb52e05c15ec5e8d0ffbff
7
- data.tar.gz: 315f6fc27b036b3f451113d7d531526627cabfd10e6e2f8ae213f2b7ad55189e47cda1d6f673249eb5ae7eb1e75f3408c15133916f3d27b56864b6aaa405ac8c
6
+ metadata.gz: 805d13b4368ff596aa1bb3be6888d9373a560d67a35c164bcaf19ba7fa50eeaf3c78629b5a575c137720862d36101f6f4eb365016c87565ec70ef20593bf9b35
7
+ data.tar.gz: f581ace941d46f3d55c3082c648fe375f9ba39a39ecb8466a46507d6c6b55c70b9aef4c48dd4219829dbc0644e057fe1ab61f85ffe72b72f2194320b357b56d8
data/README.md CHANGED
@@ -1,7 +1,10 @@
1
1
  Dandelion
2
2
  =========
3
+ [![Gem Version](https://badge.fury.io/rb/dandelion.png)](http://badge.fury.io/rb/dandelion)
4
+ [![Dependency Status](https://gemnasium.com/scttnlsn/dandelion.png)](https://gemnasium.com/scttnlsn/dandelion)
5
+ [![Code Climate](https://codeclimate.com/github/scttnlsn/dandelion.png)](https://codeclimate.com/github/scttnlsn/dandelion)
3
6
 
4
- Incremental Git repository deployment.
7
+ Incremental Git repository deployment for OS X and Linux.
5
8
 
6
9
  Install
7
10
  -------
@@ -97,6 +100,10 @@ Required:
97
100
  * `secret_access_key`
98
101
  * `bucket_name`
99
102
 
103
+ Optional:
104
+
105
+ * `host` (defaults to s3.amazonaws.com)
106
+
100
107
  Usage
101
108
  -----
102
109
 
@@ -11,6 +11,7 @@ module Dandelion
11
11
  @access_key_id = config['access_key_id']
12
12
  @secret_access_key = config['secret_access_key']
13
13
  @bucket_name = config['bucket_name']
14
+ @host = config['host']
14
15
  @path = config['path']
15
16
  end
16
17
 
@@ -37,7 +38,14 @@ module Dandelion
37
38
  protected
38
39
 
39
40
  def s3connect!
40
- AWS::S3::Base.establish_connection!(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key, :use_ssl => true) unless AWS::S3::Base.connected?
41
+ options = {
42
+ :access_key_id => @access_key_id,
43
+ :secret_access_key => @secret_access_key,
44
+ :use_ssl => true
45
+ }
46
+
47
+ options[:server] = @host if @host
48
+ AWS::S3::Base.establish_connection!(options) unless AWS::S3::Base.connected?
41
49
  end
42
50
 
43
51
  def path(file)
@@ -59,8 +59,15 @@ module Dandelion
59
59
  end
60
60
 
61
61
  @options[:additional].each do |file|
62
- log.debug("Uploading additional file: #{file}")
63
- @backend.write(file, IO.read(file))
62
+ local_path = file
63
+ remote_path = file
64
+
65
+ if file.is_a?(Hash)
66
+ local_path, remote_path = file.first
67
+ end
68
+
69
+ log.debug("Uploading additional file: #{local_path} -> #{remote_path}")
70
+ @backend.write(remote_path, IO.read(local_path))
64
71
  end
65
72
  end
66
73
 
@@ -1,3 +1,3 @@
1
1
  module Dandelion
2
- VERSION = '0.3.14'
2
+ VERSION = '0.3.15'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dandelion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.14
4
+ version: 0.3.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Nelson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-05 00:00:00.000000000 Z
11
+ date: 2014-02-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: grit
@@ -145,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
145
  version: '0'
146
146
  requirements: []
147
147
  rubyforge_project:
148
- rubygems_version: 2.0.2
148
+ rubygems_version: 2.0.14
149
149
  signing_key:
150
150
  specification_version: 4
151
- summary: dandelion-0.3.14
151
+ summary: dandelion-0.3.15
152
152
  test_files:
153
153
  - test/fixtures/diff
154
154
  - test/fixtures/ls_tree
@@ -182,4 +182,3 @@ test_files:
182
182
  - test/test_git.git/refs/heads/master
183
183
  - test/test_git.rb
184
184
  - test/test_sftp.rb
185
- has_rdoc: