apcera-stager-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6354b54a517b42f0fd4aa4013507bd2f783d5ae8
-  data.tar.gz: 82aebe6f2cc5a146dbe8c395c69b285e7009c4d4
+  metadata.gz: a9dd6d7eb756e6ca3067097459ad91639f4fe79c
+  data.tar.gz: a38aab10c262f0dade6c6ce10aa9ac26b318cb46
 SHA512:
-  metadata.gz: 43b3b79c36d82795182b4fa858c2e9748e47dfcbc3812ffb629ddc30846d25cecd84c38efff83478fca3d79463d8fc496ee5bbb0010e622d14e0396872b655fc
-  data.tar.gz: 5fa378995637afd588a6ad5b9659e705d1febe1692af0c0572b64e464aa74725cc8baf86001a210041c20efee9f8f781b155929d00d1bbe0b5dba77d647566e0
+  metadata.gz: b12f8f8efea4ce6f829082aafb0092a7e9cd5664f6ef14f88f9696a999bb9ee4d663cb75ab22735a10bacdf95afdf7b64febc1ad176a7886cbf696efb54fa68e
+  data.tar.gz: cb56f494eb2e0a6799d038a39c1d3760da0234dbb709b3c76c9972e164172f15607234b63497e74780492692e13b92c0e71e8428cb7a36d1a0ef7becea454288

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 Documentation started at the 0.2.5 release.
 
+## 0.3.2 apcera-stager-api
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Fixed a problem with the upload routine that would prevent your files from
+being wrapped in the expected directory when having used `extract("some_dir")`.
+
 ## 0.3.1 apcera-stager-api
 
 ### Added

data/apcera-stager-api-contrib.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.name          = "apcera-stager-api"
   gem.require_paths = ["lib"]
-  gem.version       = "0.3.1"
+  gem.version       = "0.3.2"
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '~> 10.5'
   gem.add_development_dependency 'webmock', '1.11'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'vcr'

data/lib/apcera/stager/stager.rb

@@ -115,7 +115,10 @@ module Apcera
 
         upload_file(@pkg_path)
       else
-        execute_app("tar czf #{@updated_pkg_path} ./*")
+        # Use execute instead of execute_app so that if the user provided a dir
+        # to extract into it results in the uploaded package being wrapped in
+        # that directory.
+        execute("cd #{@app_path} && tar czf #{@updated_pkg_path} ./*")
 
         upload_file(@updated_pkg_path)
       end

data/spec/apcera/stager/stager_spec.rb

@@ -209,11 +209,35 @@ describe Apcera::Stager do
 
         @stager.extract(@appdir)
 
-        @stager.should_receive(:execute_app).with("tar czf #{@stager.updated_pkg_path} ./*").and_return
+        @stager.should_receive(:execute).with("cd #{@stager.app_path} && tar czf #{@stager.updated_pkg_path} ./*").and_return
 
         @stager.upload
       end
 
+      it "should upload files with a wrapping directory if extracted into one" do
+        VCR.use_cassette('download') do
+          @stager.download
+        end
+
+        @stager.extract(@appdir)
+        @stager.upload
+
+        out = `tar -tf #{@stager.updated_pkg_path}`
+        out.should include("./#{@appdir}/")
+      end
+
+      it "should upload files without a wrapping directory if not extracted into one" do
+        VCR.use_cassette('download') do
+          @stager.download
+        end
+
+        @stager.extract()
+        @stager.upload
+
+        out = `tar -tf #{@stager.updated_pkg_path}`
+        out.should_not include("./#{@appdir}/")
+      end
+
       it "should upload the original package when the app wasn't extracted" do
         VCR.use_cassette('download') do
           @stager.download

data/spec/fixtures/cassettes/complete.yml

@@ -52,4 +52,47 @@ http_interactions:
       string: OK
     http_version: 
   recorded_at: Mon, 25 Aug 2014 02:37:56 GMT
-recorded_with: VCR 2.9.2
+- request:
+    method: post
+    uri: http://example.com/failed
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '0'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Cache-Control:
+      - max-age=604800
+      Content-Type:
+      - text/html
+      Date:
+      - Mon, 21 Mar 2016 19:07:01 GMT
+      Expires:
+      - Mon, 28 Mar 2016 19:07:01 GMT
+      Server:
+      - EOS (lax004/2812)
+      Content-Length:
+      - '452'
+    body:
+      encoding: UTF-8
+      string: "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<!DOCTYPE html PUBLIC
+        \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n         \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html
+        xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n\t<head>\n\t\t<title>404
+        - Not Found</title>\n\t</head>\n\t<body>\n\t\t<h1>404 - Not Found</h1>\n\t\t<script
+        type=\"text/javascript\" src=\"http://gp1.wpc.edgecastcdn.net/00222B/jtest/beacontest.js\"></script>\n\t</body>\n</html>\n"
+    http_version: 
+  recorded_at: Mon, 21 Mar 2016 19:07:01 GMT
+recorded_with: VCR 3.0.1

data/spec/fixtures/cassettes/upload.yml

@@ -52,4 +52,47 @@ http_interactions:
       string: OK
     http_version: 
   recorded_at: Mon, 25 Aug 2014 02:00:56 GMT
-recorded_with: VCR 2.9.2
+- request:
+    method: post
+    uri: http://example.com/failed
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      Accept:
+      - "*/*; q=0.5, application/xml"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Length:
+      - '0'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Cache-Control:
+      - max-age=604800
+      Content-Type:
+      - text/html
+      Date:
+      - Mon, 21 Mar 2016 19:07:00 GMT
+      Expires:
+      - Mon, 28 Mar 2016 19:07:00 GMT
+      Server:
+      - EOS (lax004/2812)
+      Content-Length:
+      - '452'
+    body:
+      encoding: UTF-8
+      string: "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n<!DOCTYPE html PUBLIC
+        \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n         \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html
+        xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n\t<head>\n\t\t<title>404
+        - Not Found</title>\n\t</head>\n\t<body>\n\t\t<h1>404 - Not Found</h1>\n\t\t<script
+        type=\"text/javascript\" src=\"http://gp1.wpc.edgecastcdn.net/00222B/jtest/beacontest.js\"></script>\n\t</body>\n</html>\n"
+    http_version: 
+  recorded_at: Mon, 21 Mar 2016 19:07:00 GMT
+recorded_with: VCR 3.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apcera-stager-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Josh Ellithorpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement