continuum-stager-api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWRiOTA4YWU1ZGNlZDA4YzI4MTMwMjRmYjA2ZjlmYTZiYjMxOTZlMg==
-  data.tar.gz: !binary |-
-    ZDE3NWEwODI5MGIyNjMyODcyYTNmNDU4NjZmNmI5ZmM4NWY2ODkzOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjUwY2Q0YzVkYzc4MTYxYTVmMTMwNGUxYzIxNGIzMzZiZjQ4MzVmM2JmMjAw
-    ODFhNTJmOTE2Yzc4YmMzNjMyMGRmOTUzZjlkYTY2NjIxYWVlZjJiOWIxZjRk
-    ZGRlODlmZDJmZDVmOTU0YjlhZmQ3ODU4YzQwZDlhMWQzYjUzNzM=
-  data.tar.gz: !binary |-
-    MjQwMzdkODU0YzI3NGQxNTIwMzgxZmRmYWM5NzcyMDY2Mjk4ZTk1MDNkODgx
-    OGM0MjBlYzI5Y2NlYzdkZTA5ZTI5NmM0ODNkODczMTVmNjVkM2RmYWU2OGYy
-    ZWUwMjk0NTI2OTZjY2VhZjVkOTExMWQ2OTc5NGU2MjUwYzUwOGU=
+SHA1:
+  metadata.gz: 87c3aa31c2d8599ca0d727e99ebb0672fc81963f
+  data.tar.gz: 152f10e919cb7426d1e7f95a8bab1c379df3bded
+SHA512:
+  metadata.gz: 72a8ab538de1f47d1ab5d2b380682c71e0f00eebd2f5e3b259df9deb2b996643827128613f40d349e7497cdf7b7d02c4231b84bc6f3d7206f06e0f52cf3736d2
+  data.tar.gz: 6e2dd9ebe4c5751b97b331489a72d5f2db2f9fa46ec9344311c603633b2e50fb3cc3dfdb8cb97c574142739c67a98d7653f534bc6a269a9a9d30f7ec74e57d79

data/apcera-stager-api-contrib.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.name          = "continuum-stager-api"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
   gem.add_development_dependency 'rake'

data/lib/apcera/stager/stager.rb

@@ -67,7 +67,7 @@ module Apcera
 
     # Upload the new package to the staging coordinator
     def upload
-      execute_app("tar czf #{@updated_pkg_path} .")
+      execute_app("tar czf #{@updated_pkg_path} #{@app_path}")
 
       sha1 = Digest::SHA1.file(@updated_pkg_path)
       File.open(@updated_pkg_path, "rb") do |f|
@@ -249,16 +249,18 @@ module Apcera
       exit code
     end
 
-    private
-
+    # Output to stderr
     def output_error(text)
       $stderr.puts text
     end
 
+    # Output to stdout
     def output(text)
       $stdout.puts text
     end
 
+    private
+
     def setup_environment
       # When staging we use the root path. These are overridden in tests.
       @root_path = "/"

data/spec/apcera/stager/stager_spec.rb

@@ -3,29 +3,29 @@ require 'spec_helper'
 describe Apcera::Stager do
   before do
     @appdir = "site"
-
-    # See mock server directory for setup!
     @stager_url = "http://example.com"
   end
 
-  it "should raise an exception when initialized without a stager url" do
-    expect { Apcera::Stager.new }.to raise_error(Apcera::Error::StagerURLRequired)
-  end
-
-  it "should initialize with the stager url passed as an argument" do
-    stager = Apcera::Stager.new({:stager_url => @stager_url})
-    stager.class.should == Apcera::Stager
-    stager.stager_url.should == @stager_url
-  end
+  describe "initialize" do
+    it "should raise an exception when initialized without a stager url" do
+      expect { Apcera::Stager.new }.to raise_error(Apcera::Error::StagerURLRequired)
+    end
 
-  it "should initialize when the ENV variable STAGER_URL is present" do
-    begin
-      ENV["STAGER_URL"] = @stager_url
-      stager = Apcera::Stager.new
+    it "should initialize with the stager url passed as an argument" do
+      stager = Apcera::Stager.new({:stager_url => @stager_url})
       stager.class.should == Apcera::Stager
       stager.stager_url.should == @stager_url
-    ensure
-      ENV["STAGER_URL"] = nil
+    end
+
+    it "should initialize when the ENV variable STAGER_URL is present" do
+      begin
+        ENV["STAGER_URL"] = @stager_url
+        stager = Apcera::Stager.new
+        stager.class.should == Apcera::Stager
+        stager.stager_url.should == @stager_url
+      ensure
+        ENV["STAGER_URL"] = nil
+      end
     end
   end
 
@@ -76,38 +76,40 @@ describe Apcera::Stager do
     end
 
     context "extract" do
-      it "should decompress the package to a supplied path" do
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
+      end
 
+      it "should decompress the package to a supplied path" do
         @stager.extract(@appdir)
-        File.exists?(File.join(@stager.root_path, @appdir)).should == true
+        expected_path = File.join(@stager.root_path, @appdir)
+        File.exists?(expected_path).should == true
+        @stager.app_path.should == expected_path
       end
 
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
         err = Apcera::Error::ExecuteError.new
-        @stager.should_receive(:execute_app).and_raise(err)
+        @stager.should_receive(:execute_app).with("tar -zxf #{@stager.pkg_path}").and_raise(err)
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
-
-        expect { @stager.extract(@appdir) }.to raise_error(err)
+        expect { @stager.extract(@appdir) }.to raise_error(err.class)
       end
     end
 
     context "execute" do
-      it "should execute commands with clean bundler environment" do
-        Bundler.should_receive(:with_clean_env).at_least(:once).and_yield
-
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
 
         @stager.extract(@appdir)
+      end
+
+      it "should execute commands with clean bundler environment" do
+        Bundler.should_receive(:with_clean_env).at_least(:once).and_yield
 
         @stager.execute("cat thing").should == nil
         @stager.execute("cat #{File.join(@stager.app_path, "app", "Gemfile")}").should == true
@@ -116,26 +118,22 @@ describe Apcera::Stager do
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
-
-        @stager.extract(@appdir)
-
         cmd = "cat thing"
         expect {@stager.execute(cmd) }.to raise_error(Apcera::Error::ExecuteError, "failed to execute: #{cmd}.\n")
       end
     end
 
     context "execute_app" do
-      it "should execute commands in app dir with clean bundler environment" do
-        Bundler.should_receive(:with_clean_env).at_least(:once).and_yield
-
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
 
         @stager.extract(@appdir)
+      end
+
+      it "should execute commands in app dir with clean bundler environment" do
+        Bundler.should_receive(:with_clean_env).at_least(:once).and_yield
 
         @stager.execute_app("cat thing").should == nil
         @stager.execute_app("cat #{File.join("app", "Gemfile")}").should == true
@@ -144,40 +142,36 @@ describe Apcera::Stager do
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
-
-        @stager.extract(@appdir)
-
         cmd = "cat thing"
         expect {@stager.execute_app(cmd) }.to raise_error(Apcera::Error::ExecuteError, "failed to execute: #{cmd}.\n")
       end
     end
 
     context "upload" do
-      it "should compress a new package and send to the staging coordinator" do
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
 
         @stager.extract(@appdir)
+      end
 
+      it "should compress a new package and send to the staging coordinator" do
         VCR.use_cassette('upload') do
           @stager.upload
         end
 
-        File.exists?(File.join(@stager.root_path, "#{@appdir}.tar.gz"))
+        File.exists?(@stager.updated_pkg_path).should == true
       end
 
-      it "should bubble errors to fail" do
-        @stager.should_receive(:exit0r).with(1) { raise }
+      it "should compress using tar czf" do
+        @stager.should_receive(:execute_app).with("tar czf #{@stager.updated_pkg_path} #{@stager.app_path}").and_return
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
+        @stager.upload
+      end
 
-        @stager.extract(@appdir)
+      it "should bubble errors to fail" do
+        @stager.should_receive(:exit0r).with(1) { raise }
 
         VCR.use_cassette('invalid/upload') do
           expect { @stager.upload }.to raise_error(RestClient::ResourceNotFound, "404 Resource Not Found")
@@ -186,13 +180,15 @@ describe Apcera::Stager do
     end
 
     context "complete" do
-      it "should compress a new package and send to the staging coordinator then be done" do
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
 
         @stager.extract(@appdir)
+      end
 
+      it "should compress a new package and send to the staging coordinator then be done" do
         VCR.use_cassette('complete') do
           @stager.complete
         end
@@ -203,12 +199,6 @@ describe Apcera::Stager do
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
-
-        @stager.extract(@appdir)
-
         VCR.use_cassette('invalid/complete') do
           expect { @stager.complete }.to raise_error(RestClient::ResourceNotFound, "404 Resource Not Found")
         end
@@ -234,11 +224,16 @@ describe Apcera::Stager do
     end
 
     context "snapshot" do
-      it "should send a snapshot request to the staging coordinator" do
+      before do
         VCR.use_cassette('download') do
           @stager.download
         end
+
         @stager.extract(@appdir)
+      end
+
+      it "should send a snapshot request to the staging coordinator" do
+
         VCR.use_cassette('snapshot') do
           @stager.snapshot
         end
@@ -250,10 +245,6 @@ describe Apcera::Stager do
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
-        VCR.use_cassette('download') do
-          @stager.download
-        end
-        @stager.extract(@appdir)
         VCR.use_cassette('invalid/snapshot') do
           expect { @stager.snapshot }.to raise_error(RestClient::ResourceNotFound, "404 Resource Not Found")
         end
@@ -471,6 +462,28 @@ describe Apcera::Stager do
       end
     end
 
+    context "output" do
+      before do
+        @stager.unstub(:output)
+      end
+
+      it "should print to stdout" do
+        $stdout.should_receive(:puts).with("test")
+        @stager.output("test")
+      end
+    end
+
+    context "output_error" do
+      before do
+        @stager.unstub(:output_error)
+      end
+
+      it "should print to stderr" do
+        $stderr.should_receive(:puts).with("test")
+        @stager.output_error("test")
+      end
+    end
+
     context "exit0r" do
       before do
         @stager.unstub(:exit0r)

data/spec/fixtures/cassettes/complete.yml

@@ -52,4 +52,67 @@ http_interactions:
       string: OK
     http_version: 
   recorded_at: Mon, 25 Aug 2014 02:37:56 GMT
+- 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:
+      Accept-Ranges:
+      - bytes
+      Cache-Control:
+      - max-age=604800
+      Content-Type:
+      - text/html
+      Date:
+      - Tue, 26 Aug 2014 08:19:48 GMT
+      Etag:
+      - '"359670651"'
+      Expires:
+      - Tue, 02 Sep 2014 08:19:48 GMT
+      Last-Modified:
+      - Fri, 09 Aug 2013 23:54:35 GMT
+      Server:
+      - EOS (lax004/45BF)
+      X-Ec-Custom-Error:
+      - '1'
+      Content-Length:
+      - '1270'
+    body:
+      encoding: UTF-8
+      string: "<!doctype html>\n<html>\n<head>\n    <title>Example Domain</title>\n\n
+        \   <meta charset=\"utf-8\" />\n    <meta http-equiv=\"Content-type\" content=\"text/html;
+        charset=utf-8\" />\n    <meta name=\"viewport\" content=\"width=device-width,
+        initial-scale=1\" />\n    <style type=\"text/css\">\n    body {\n        background-color:
+        #f0f0f2;\n        margin: 0;\n        padding: 0;\n        font-family: \"Open
+        Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n        \n    }\n
+        \   div {\n        width: 600px;\n        margin: 5em auto;\n        padding:
+        50px;\n        background-color: #fff;\n        border-radius: 1em;\n    }\n
+        \   a:link, a:visited {\n        color: #38488f;\n        text-decoration:
+        none;\n    }\n    @media (max-width: 700px) {\n        body {\n            background-color:
+        #fff;\n        }\n        div {\n            width: auto;\n            margin:
+        0 auto;\n            border-radius: 0;\n            padding: 1em;\n        }\n
+        \   }\n    </style>    \n</head>\n\n<body>\n<div>\n    <h1>Example Domain</h1>\n
+        \   <p>This domain is established to be used for illustrative examples in
+        documents. You may use this\n    domain in examples without prior coordination
+        or asking for permission.</p>\n    <p><a href=\"http://www.iana.org/domains/example\">More
+        information...</a></p>\n</div>\n</body>\n</html>\n"
+    http_version: 
+  recorded_at: Tue, 26 Aug 2014 08:19:48 GMT
 recorded_with: VCR 2.9.2

data/spec/fixtures/cassettes/upload.yml

@@ -27,4 +27,29 @@ http_interactions:
       string: OK
     http_version: 
   recorded_at: Mon, 25 Aug 2014 02:37:56 GMT
+- request:
+    method: post
+    uri: http://example.com/done
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/html; charset=ISO-8859-1
+      Date:
+      - Mon, 25 Aug 2014 02:00:56 GMT
+      Content-Length:
+      - '2'
+      Connection:
+      - close
+    body:
+      encoding: US-ASCII
+      string: OK
+    http_version: 
+  recorded_at: Mon, 25 Aug 2014 02:00:56 GMT
 recorded_with: VCR 2.9.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: continuum-stager-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -14,56 +14,56 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Continuum Stager api library
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -171,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Continuum Stager api library which makes it super easy to write stagers for