ci-cache 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288ef0fe2be849cb4a5d1fbb0f48ecfae5fc62eb
-  data.tar.gz: 46f0d3a3f1b403bf6f678e48f9e0cdfbc7b808e9
+  metadata.gz: 79c6f62e7140ce98a3a46c1152220de94933c108
+  data.tar.gz: 3c5747e523e18f4e5b2c611b9e94adbde1771fca
 SHA512:
-  metadata.gz: b5ad74c170005c79dd259ff97441d77bbbb85dcda12ee52bf24675daf9478b9effa8fdb7735053c520be586bb5315fcb146ae34f11cfb36d60088bbfb659db07
-  data.tar.gz: 18d7f343646cf8d6bbaa12f239a2690a6ffab84e495d8884812ec24a99b859f982c6587ad0df121b35a60923e49f58796b352da704f4c0cda7c623dc6d85565a
+  metadata.gz: 5b743cdac3da092db121d537c2e84ff68470bc2054303f929729d248c3c6a87a6e8d27bd676c0c2e297d4f45ec85c6337a96d4e7c01c7f4e2d8da7e603305439
+  data.tar.gz: 2da6f3d3b85076f74edcbddb78fa83e5fc4adfe1964882eef2df2961a68f9954330f2af68770f273e03aa5fbb764cf6a444483da8b57d1fb68dd56857dc50a12

data/.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

data/.travis.yml

@@ -6,9 +6,9 @@ rvm:
 - rbx-19mode
 deploy:
   provider: rubygems
-  api_key:
-    secure: XMfj0fh0v8byvY67GtTLIeJcxEpmt7WBOTF9fmsEsWv6Wq2ZYeWdlLxgK042FTB7IkFYVF6EsA4zmOFKZkMpypwROj0cwTEeoA/5DjukowVc2KwpRLXMCUBeatRD9U63A8gq3CVrS7t5emo4trxb6lH+x3HIgF5Ef4n8Sj+MWJM=
   gem: ci-cache
   on:
     tags: true
     repo: johanneswuerbach/ci-cache
+  api_key:
+    secure: AMbQe7WSmP/41Fi9XCHlTF+qxlPhbTSu9/6r7FUPK3b5lFoegdiQCyFw1QdKHtBHW8Rcjb7MyDKehlnnUhNbO6jA5ioccfLCZsvc3mh3Ce5HO0xhJiN9sZ+7Odt5Xgj1OPrMPeyt3bV5J84MwUrrRhP2EOwrfSArJnWaFdAJ/dc=

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# master
+
+# 1.1.0
+
+* Added support to prefix file names on S3

data/lib/ci-cache/storage.rb

@@ -9,8 +9,9 @@ module CiCache
 
     def download(name, tmp_folder)
       target_file = "#{tmp_folder}/#{name}"
-      log "Download: #{name} ~> #{target_file}"
-      object = bucket_object(name)
+      prefixed_name = prefixed_name(name)
+      log "Download: #{prefixed_name} ~> #{target_file}"
+      object = bucket_object(prefixed_name)
       File.open(target_file, 'wb') do |file|
         object.read do |chunk|
            file.write(chunk)
@@ -21,13 +22,18 @@ module CiCache
     end
 
     def upload(name, content)
-      log "Upload: #{name}"
-      object = bucket_object(name)
+      prefixed_name = prefixed_name(name)
+      log "Upload: #{prefixed_name}"
+      object = bucket_object(prefixed_name)
       object.write(content)
     end
 
     private
 
+    def prefixed_name(name)
+      prefix + name
+    end
+
     def log(message)
       @context.log(message)
     end
@@ -36,6 +42,10 @@ module CiCache
       ENV["CI_CACHE_S3_BUCKET"]
     end
 
+    def prefix
+      ENV["CI_CACHE_S3_PREFIX"] || ""
+    end
+
     def configure_aws
       AWS.config(
         access_key_id: ENV["CI_CACHE_S3_KEY"],

data/lib/ci-cache/version.rb

@@ -1,3 +1,3 @@
 module CiCache
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/storage_spec.rb

@@ -16,8 +16,18 @@ describe CiCache::Storage do
     subject { storage.download(name, folder) }
 
     context "when the object exists" do
+
       it "downloads the object" do
-        storage.should_receive(:bucket_object).and_return(object)
+        storage.should_receive(:bucket_object).with(name).and_return(object)
+        object.should_receive(:read).and_yield("chunk")
+        handle.should_receive(:write).with("chunk")
+        File.should_receive(:open).with("~/file", "wb").and_yield(handle)
+        subject
+      end
+
+      it "uses a defined prefix" do
+        storage.should_receive(:prefix).and_return("my-repo/")
+        storage.should_receive(:bucket_object).with("my-repo/" + name).and_return(object)
         object.should_receive(:read).and_yield("chunk")
         handle.should_receive(:write).with("chunk")
         File.should_receive(:open).with("~/file", "wb").and_yield(handle)
@@ -38,7 +48,14 @@ describe CiCache::Storage do
     subject { storage.upload(name, "content") }
 
     it "uploads the content" do
-      storage.should_receive(:bucket_object).and_return(object)
+      storage.should_receive(:bucket_object).with(name).and_return(object)
+      object.should_receive(:write).with("content")
+      subject
+    end
+
+    it "uses a defined prefix" do
+      storage.should_receive(:prefix).and_return("my-repo/")
+      storage.should_receive(:bucket_object).with("my-repo/" + name).and_return(object)
       object.should_receive(:write).with("content")
       subject
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Johannes Würbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -59,9 +59,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .editorconfig
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md