continuum-stager-api 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8397c207ff012d3a21c39caaf0c8831173f9860
-  data.tar.gz: 82da84b55827b2b4ec29b1f2a1d30971ba5891e8
+  metadata.gz: 12edd2b8b9c59ea9e1559d0d82a70dcd80974852
+  data.tar.gz: 4ff0c5b27bcce22bbfceeeb0efbbb42ec58f9156
 SHA512:
-  metadata.gz: 01dc3b2af39d1d59cc942e435aa3a9bba2997ecc052d83318060a88fda4197fabb2b1edd8682ef7b5f2abe5487e32f59aced4ba8623faf8ddbfa97c569e7134c
-  data.tar.gz: 24c2214f6dccbcc8955d5d97fd3cf1d29d63eaa433b79e19654dff2af480f9ca4ea178d123c6a00b8baf8c9caa48df3bc383f8a8e3f44edb760c09fce1b86bbe
+  metadata.gz: 882efbf11bd13e8d214ab3da90bec6305fd6d77d3bd1bf8e1c02b5b428ebed875a79a1df9d92db6882b08d1fe51c960dcd059fd8a6f84ce04f742f4d30f66621
+  data.tar.gz: 428d0d08dd667c23809f312c89cbde645d0971b8f4605788faafe4c92e1a3ac3199667972172a16ccfa31b55e524f1b780eaa73d23bac41ada92dacf77290ae9

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.7"
+  gem.version       = "0.1.8"
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
   gem.add_development_dependency 'rake'

data/lib/apcera/stager/error.rb

@@ -2,5 +2,6 @@ module Apcera
   module Error
     class StagerURLRequired < StandardError; end
     class ExecuteError < StandardError; end
+    class AppPathError < StandardError; end
   end
 end

data/lib/apcera/stager/stager.rb

@@ -41,6 +41,7 @@ module Apcera
 
     # Execute a command in the app dir. Useful helper.
     def execute_app(cmd)
+      raise_app_path_error if @app_path == nil
       Bundler.with_clean_env do
         Dir.chdir(@app_path) do |app_path|
           result = system(cmd, @system_options)
@@ -67,12 +68,13 @@ module Apcera
 
     # Upload the new package to the staging coordinator
     def upload
+      raise_app_path_error if @app_path == nil
       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)
       File.open(@updated_pkg_path, "rb") do |f|
-        response = RestClient.post(@stager_url+"/data?sha1=#{sha1.to_s}", f.read, { :content_type => "application/octet-stream" } )
+        response = RestClient.post(@stager_url+"/data?sha1=#{sha1.to_s}", f, { :content_type => "application/octet-stream" } )
       end
     rescue => e
       fail e
@@ -87,7 +89,7 @@ module Apcera
 
     # Add environment variable to package.
     def environment_add(key, value)
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "environment",
         :action => "add",
         :key => key,
@@ -99,7 +101,7 @@ module Apcera
 
     # Delete environment variable from package.
     def environment_remove(key, value)
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "environment",
         :action => "remove",
         :key => key,
@@ -111,7 +113,7 @@ module Apcera
 
     # Add provides to package.
     def provides_add(type, name)
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "provides",
         :action => "add",
         :type => type,
@@ -123,7 +125,7 @@ module Apcera
 
     # Delete provides from package.
     def provides_remove(key, value)
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "provides",
         :action => "remove",
         :type => type,
@@ -138,7 +140,7 @@ module Apcera
       exists = self.meta["dependencies"].detect { |dep| dep["type"] == type && dep["name"] == name }
       return false if exists
 
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "dependencies",
         :action => "add",
         :type => type,
@@ -155,7 +157,7 @@ module Apcera
       exists = self.meta["dependencies"].detect { |dep| dep["type"] == type && dep["name"] == name}
       return false if !exists
 
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "dependencies",
         :action => "remove",
         :type => type,
@@ -169,7 +171,7 @@ module Apcera
 
     # Add template to package.
     def templates_add(path, left_delimiter = "{{", right_delimiter = "}}")
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "templates",
         :action => "add",
         :path => path,
@@ -182,7 +184,7 @@ module Apcera
 
     # Delete template from package.
     def templates_remove(path, left_delimiter = "{{", right_delimiter = "}}")
-      response = RestClient.put(@stager_url+"/meta", {
+      response = RestClient.put(stager_meta_url, {
         :resource => "templates",
         :action => "remove",
         :path => path,
@@ -195,7 +197,7 @@ module Apcera
 
     # Get metadata for the package being staged.
     def meta
-      response = RestClient.get(@stager_url+"/meta")
+      response = RestClient.get(stager_meta_url)
       return JSON.parse(response.to_s)
     rescue => e
       output_error "Error: #{e.message}.\n"
@@ -272,6 +274,10 @@ module Apcera
 
     private
 
+    def raise_app_path_error
+      raise Apcera::Error::AppPathError.new("app path not set, please run extract!\n")
+    end
+
     def setup_environment
       # When staging we use the root path. These are overridden in tests.
       @root_path = "/tmp"
@@ -279,5 +285,9 @@ module Apcera
       @updated_pkg_path = File.join(@root_path, UPDATED_PKG_NAME)
       @system_options = {}
     end
+
+    def stager_meta_url
+      @stager_url + "/meta"
+    end
   end
 end

data/spec/apcera/stager/stager_spec.rb

@@ -128,20 +128,29 @@ describe Apcera::Stager 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.extract(@appdir)
+
         @stager.execute_app("cat thing").should == nil
         @stager.execute_app("cat #{File.join("app", "Gemfile")}").should == true
       end
 
+      it "should bubble errors to fail when app path is missing (no extract)" do
+        @stager.should_receive(:exit0r).with(1) { raise }
+
+        cmd = "cat thing"
+        expect {@stager.execute_app(cmd) }.to raise_error(Apcera::Error::AppPathError, "app path not set, please run extract!\n")
+      end
+
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
+        @stager.extract(@appdir)
+
         cmd = "cat thing"
         expect {@stager.execute_app(cmd) }.to raise_error(Apcera::Error::ExecuteError, "failed to execute: #{cmd}.\n")
       end
@@ -152,11 +161,11 @@ describe Apcera::Stager 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
+        @stager.extract(@appdir)
+
         VCR.use_cassette('upload') do
           @stager.upload
         end
@@ -165,14 +174,25 @@ describe Apcera::Stager do
       end
 
       it "should compress using tar czf" do
+        @stager.extract(@appdir)
+
         @stager.should_receive(:execute_app).with("cd #{@stager.app_path}/.. && tar czf #{@stager.updated_pkg_path} #{@appdir}").and_return
 
         @stager.upload
       end
 
+      it "should bubble errors to fail when app path is missing (no extract)" do
+        @stager.should_receive(:exit0r).with(1) { raise }
+
+        cmd = "cat thing"
+        expect {@stager.upload }.to raise_error(Apcera::Error::AppPathError, "app path not set, please run extract!\n")
+      end
+
       it "should bubble errors to fail" do
         @stager.should_receive(:exit0r).with(1) { raise }
 
+        @stager.extract(@appdir)
+
         VCR.use_cassette('invalid/upload') do
           expect { @stager.upload }.to raise_error(RestClient::ResourceNotFound, "404 Resource Not Found")
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continuum-stager-api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Josh Ellithorpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client