continuum-stager-api 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420af5409400c5903880516ca6f9aa8d3eb14f9f
-  data.tar.gz: f6e06621f8be8fcaeb296de08459bfdc39dce3a8
+  metadata.gz: 69b8178c6c6ee4e833c557f4c14e71a259a2c3c6
+  data.tar.gz: f55ca0ef16ccb7be730779eea921131fb2225fee
 SHA512:
-  metadata.gz: 7cb2832e2d7d6faace8f7f6b5548cd197b2d9cfddec5395e34e05851ffdf4fc5678f640ab800dcdb833fafadcc0f81ea1c5d572eb4a581d40b081bf5be732ce8
-  data.tar.gz: 849c2753e5746117d6c44c6fbbf1ff5dccb4d0f54ee57c34d32204314ee3789daf11ca70269b2f2a6b7334e4eb1ae78832a6b62ea45c27970b8d6d79047432a0
+  metadata.gz: 4a5faaf7ce1bcf70eb5527695634867f175e03f994e64eda7cf948e760e14cf6709902c5085d346ac384662b4d85e66d1d8e53d9593121285eeff5245659948b
+  data.tar.gz: 7fb89de64c02a0dd243739ae72e4a7d8b901d6d1fe3895740ee99e901e72e631cbaf37fdc668e0399e0ac3025b0c5f31b2edd62ee43945bc5c22bdd43b9cd1f3

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.5"
+  gem.version       = "0.1.6"
 
   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
-      app_dir = File.join(".", @app_path.sub(@root_path, ""))
+      app_dir = Pathname.new(@app_path).relative_path_from(Pathname.new(@root_path)).to_s
       execute_app("cd #{app_path}/.. && tar czf #{@updated_pkg_path} #{app_dir}")
 
       sha1 = Digest::SHA1.file(@updated_pkg_path)
@@ -135,24 +135,34 @@ module Apcera
 
     # Add dependencies to package.
     def dependencies_add(type, name)
+      exists = self.meta["dependencies"].detect { |dep| dep["type"] == type && dep["name"] == name }
+      return false if exists
+
       response = RestClient.post(@stager_url+"/meta", {
         :resource => "dependencies",
         :action => "add",
         :type => type,
         :name => name
       })
+
+      true
     rescue => e
       fail e
     end
 
     # Delete dependencies from package.
     def dependencies_remove(type, name)
+      exists = self.meta["dependencies"].detect { |dep| dep["type"] == type && dep["name"] == name}
+      return false if !exists
+
       response = RestClient.post(@stager_url+"/meta", {
         :resource => "dependencies",
         :action => "remove",
         :type => type,
         :name => name
       })
+
+      true
     rescue => e
       fail e
     end

data/spec/apcera/stager/stager_spec.rb

@@ -165,7 +165,7 @@ describe Apcera::Stager do
       end
 
       it "should compress using tar czf" do
-        @stager.should_receive(:execute_app).with("cd #{@stager.app_path}/.. && tar czf #{@stager.updated_pkg_path} ./#{@appdir}").and_return
+        @stager.should_receive(:execute_app).with("cd #{@stager.app_path}/.. && tar czf #{@stager.updated_pkg_path} #{@appdir}").and_return
 
         @stager.upload
       end
@@ -389,7 +389,13 @@ describe Apcera::Stager do
     context "dependencies_add" do
       it "should add to its list of dependencies" do
         VCR.use_cassette('dependencies_add') do
-          @stager.dependencies_add("os", "linux")
+          @stager.dependencies_add("os", "someos").should == true
+        end
+      end
+
+      it "should return false if the dependency is already there" do
+        VCR.use_cassette('dependencies_add') do
+          @stager.dependencies_add("os", "linux").should == false
         end
       end
 
@@ -409,6 +415,12 @@ describe Apcera::Stager do
         end
       end
 
+      it "should return false if the dependency doesn't exist" do
+        VCR.use_cassette('dependencies_remove') do
+          @stager.dependencies_remove("os", "someos").should == false
+        end
+      end
+
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 

data/spec/fixtures/cassettes/dependencies_add.yml

@@ -1,18 +1,66 @@
 ---
 http_interactions:
+- request:
+    method: get
+    uri: https://example.com/meta
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 14 Aug 2013 08:52:04 GMT
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - application/json;charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "dependencies": [
+            {"type": "os", "name": "linux"},
+            {"type": "package", "name": "build-essential"}
+          ],
+          "provides": [
+            {"type": "runtime", "name": "ruby"},
+            {"type": "runtime", "name": "ruby-1.9"}
+          ],
+          "environment": {
+            "PATH": "/opt/apcera/ruby-1.9.3/bin:$PATH",
+            "START_COMMAND": "./startme",
+            "START_PATH": "/app"
+          },
+          "templates": [
+            {
+              "path": "foo",
+              "left_delimiter": "<<",
+              "right_delimiter": ">>"
+            },
+            {
+              "path": "bar"
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 14 Aug 2013 08:52:04 GMT
 - request:
     method: post
     uri: http://example.com/meta
     body:
       encoding: US-ASCII
-      string: resource=dependencies&action=add&type=os&name=linux
+      string: resource=dependencies&action=add&type=os&name=someos
     headers:
       Content-Type:
       - application/x-www-form-urlencoded
   response:
     status:
       code: 200
-      message:
+      message: 
     headers:
       Content-Type:
       - text/html
@@ -22,7 +70,7 @@ http_interactions:
       - '4'
     body:
       encoding: US-ASCII
-      string: ! "OK"
+      string: OK
     http_version: 
   recorded_at: Mon, 25 Aug 2014 22:37:33 GMT
 - request:

data/spec/fixtures/cassettes/dependencies_remove.yml

@@ -1,5 +1,53 @@
 ---
 http_interactions:
+- request:
+    method: get
+    uri: https://example.com/meta
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 14 Aug 2013 08:52:04 GMT
+      Transfer-Encoding:
+      - chunked
+      Content-Type:
+      - application/json;charset=UTF-8
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "dependencies": [
+            {"type": "os", "name": "linux"},
+            {"type": "package", "name": "build-essential"}
+          ],
+          "provides": [
+            {"type": "runtime", "name": "ruby"},
+            {"type": "runtime", "name": "ruby-1.9"}
+          ],
+          "environment": {
+            "PATH": "/opt/apcera/ruby-1.9.3/bin:$PATH",
+            "START_COMMAND": "./startme",
+            "START_PATH": "/app"
+          },
+          "templates": [
+            {
+              "path": "foo",
+              "left_delimiter": "<<",
+              "right_delimiter": ">>"
+            },
+            {
+              "path": "bar"
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 14 Aug 2013 08:52:04 GMT
 - request:
     method: post
     uri: http://example.com/meta

data/spec/fixtures/cassettes/metadata.yml

@@ -48,4 +48,4 @@ http_interactions:
         }
     http_version: 
   recorded_at: Wed, 14 Aug 2013 08:52:04 GMT
-recorded_with: VCR 2.5.0
+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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Josh Ellithorpe