dpl 1.5.3.travis.252.2 → 1.5.3.travis.254.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/README.md +3 -2
- data/lib/dpl/provider/s3.rb +4 -2
- data/spec/provider/s3_spec.rb +9 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
OWI4ZDExOTkyZTE2YzhmZTI3NWVlYmJlMzcwYTZkN2JhMmFiZDFiOA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
M2Y3ZmViZWFiZGI4NDI3N2QwOGVjNmVkMTkwM2ZhNzA5NDlkOWM2Zg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YWE3ZjMyMmU5MzM2OTYxZGUwOWMwMzVjNjBkZmMzMWJiNTI2MDJhN2Y1Yjhi
|
10
|
+
NGY1ZDQzMjg5Y2QzMmNiOWZmNWY3OTY1MDE4YjdlYWIxODhiMjQzMjkyZjg5
|
11
|
+
ZThhNjgwMDdiOWI1YjA1NTRiNjNmZTliNDlkNGM4ZmNmYzU4Zjc=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YjhmYWNlZTlmNDQxYjkyMjg4OTQ2ODJhNWY4YTQ3ODJlMzdhOTUxZWZmODJl
|
14
|
+
YjM0OTc0MTc1N2I1NGFlOWVjZjQ0YzYwYmI1OTRkMWMzNTE1OTgyYzdkMTNj
|
15
|
+
YmFiNTdmMjY0Nzc3NzEzMzYwZDI3MzZhNDJhY2EyNDBkZDNhYWU=
|
data/README.md
CHANGED
@@ -155,12 +155,13 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
|
|
155
155
|
* **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
|
156
156
|
* **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
|
157
157
|
* **bucket**: S3 Bucket.
|
158
|
-
* **upload-dir**: S3 directory to upload to. Defaults to root directory.
|
158
|
+
* **upload-dir**: S3 directory to upload to. Defaults to root directory.
|
159
|
+
* **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
|
159
160
|
|
160
161
|
#### Examples:
|
161
162
|
|
162
163
|
dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket>
|
163
|
-
dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --upload-dir=BUILDS
|
164
|
+
dpl --provider=s3 --access-key-id=<access-key-id> --secret-access-key=<secret-access-key> --bucket=<bucket> --local-dir= BUILD --upload-dir=BUILDS
|
164
165
|
|
165
166
|
### Appfog:
|
166
167
|
|
data/lib/dpl/provider/s3.rb
CHANGED
@@ -29,8 +29,10 @@ module DPL
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def push_app
|
32
|
-
Dir.
|
33
|
-
|
32
|
+
Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
|
33
|
+
Dir.glob("**/*") do |filename|
|
34
|
+
api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename)) unless File.directory?(filename)
|
35
|
+
end
|
34
36
|
end
|
35
37
|
end
|
36
38
|
|
data/spec/provider/s3_spec.rb
CHANGED
@@ -49,7 +49,15 @@ describe :needs_key? do
|
|
49
49
|
end
|
50
50
|
|
51
51
|
describe :push_app do
|
52
|
-
example do
|
52
|
+
example "Without local_dir" do
|
53
|
+
Dir.should_receive(:chdir).with(Dir.pwd)
|
54
|
+
provider.push_app
|
55
|
+
end
|
56
|
+
|
57
|
+
example "With local_dir" do
|
58
|
+
provider.options.update(:local_dir => 'BUILD')
|
59
|
+
|
60
|
+
Dir.should_receive(:chdir).with('BUILD')
|
53
61
|
provider.push_app
|
54
62
|
end
|
55
63
|
end
|