apcera-stager-api 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bfd1296f1530b54b9151231b57d1d8abc47cac8
-  data.tar.gz: 949490f21990c5015e341479cd3e7b9b057e2eba
+  metadata.gz: fc3737fcfd86c07d0f4009741e6168079d80ceb3
+  data.tar.gz: 0ad42b5acc9d9e75a146dec1cba0f73664f1e7dc
 SHA512:
-  metadata.gz: c1118b6f5b0ddf98df6358ee79f156b1fed19e0b1eaa0292e20c522f83cbfd700175fafc70ffec29457d2b662b179ddd9021096a0a4853a995798a61126138a9
-  data.tar.gz: f9cf88bf8cb869e537fee9e40408cf9b9bac59437480b418b180ea82f9a3ffbfde75f45d3d620d1f024be25494968c06d59703eca72dd3a13a8a3008834e9b4b
+  metadata.gz: 4ea8c40730ad9005247a057f21bc59ce202c255fde4dc36651af9c51ff3598bb54c13dc120cfb14debae6e953d44e5f8453721750db785084aa9fcf5c48b5501
+  data.tar.gz: a74dc48fc698a0485ed038af8dc47ef8f32adcb6c93b3f849f72041d961603994392fd9249520f3d4a1baf6a1fa2f9304a4aa4843cd794e0240b301ba70197be

data/.travis.yml

@@ -2,7 +2,6 @@ before_install:
   - gem update --system 2.1.11
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"

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          = "apcera-stager-api"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.5"
+  gem.version       = "0.3.0"
 
   gem.add_development_dependency 'rspec', '~> 2.6.0'
   gem.add_development_dependency 'rake'

data/lib/apcera/stager/stager.rb

@@ -69,11 +69,12 @@ module Apcera
       fail e
     end
 
-    # Execute a command in the app dir. Useful helper.
+    # Execute a command in the directory your package was extracted to (or where
+    # you manually set @app_dir). Useful helper.
     def execute_app(cmd)
-      raise_app_path_error if @app_path == nil
+      raise_app_path_error if @run_path == nil
       Bundler.with_clean_env do
-        Dir.chdir(@app_path) do |app_path|
+        Dir.chdir(@run_path) do |run_path|
           result = system(cmd, @system_options)
           if !result
             raise Apcera::Error::ExecuteError.new("failed to execute: #{cmd}.\n")
@@ -86,19 +87,26 @@ module Apcera
       fail e
     end
 
-    # Extract the package to a given location.
-    def extract(location)
-      @app_path = File.join(@root_path, location)
+    # Extract the package to a location within staging path, optionally creating
+    # the named folder first and extract into it. If a location parameter is
+    # given, when upload is run the folder will be uploaded up along with the
+    # files.  In either case, execute_app will run commands in the location
+    # where files were extracted to.
+    def extract(location="")
+      @app_path=File.join(@root_path, "staging")
       Dir.mkdir(@app_path) unless Dir.exists?(@app_path)
 
+      @run_path = location.empty? ? @app_path : File.join(@app_path, location)
+      Dir.mkdir(@run_path) unless Dir.exists?(@run_path)
+
       execute_app("tar -zxf #{@pkg_path}")
     rescue => e
       fail e
     end
 
-    # Upload the new package to the staging coordinator. If we have an app extracted we
-    # send that to the staging coordinator. If no app was ever extracted we just
-    # upload the unmodified app.
+    # Upload the new package to the staging coordinator. If we have an app
+    # extracted we send that to the staging coordinator. If no app was ever
+    # extracted it is a noop.
     def upload
       if @app_path == nil
         unless File.exist?(@pkg_path)
@@ -107,8 +115,7 @@ module Apcera
 
         upload_file(@pkg_path)
       else
-        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}")
+        execute_app("tar czf #{@updated_pkg_path} ./*")
 
         upload_file(@updated_pkg_path)
       end
@@ -116,7 +123,7 @@ module Apcera
       fail e
     end
 
-    # Snapshot the stager filesystem for app
+    # Snapshot the stager filesystem for app.
     def snapshot
       response = RestClient.post(@stager_url+"/snapshot", {})
     rescue => e
@@ -267,7 +274,7 @@ module Apcera
       self.meta["environment"]["START_COMMAND"]
     end
 
-    # Easily set the start command
+    # Easily set the start command.
     def start_command=(val)
       self.environment_add("START_COMMAND", val)
     end
@@ -277,7 +284,7 @@ module Apcera
       self.meta["environment"]["START_PATH"]
     end
 
-    # Easily set the start path
+    # Easily set the start path.
     def start_path=(val)
       self.environment_add("START_PATH", val)
     end
@@ -297,7 +304,7 @@ module Apcera
       exit code
     end
 
-    # Output to stderr
+    # Output to stderr.
     def output_error(text)
       $stderr.puts text
     end
@@ -307,6 +314,13 @@ module Apcera
       $stdout.puts text
     end
 
+    # Set @app_path, the location that will uploaded.  Also updates location
+    # where execute_app will run commands from.
+    def app_path=(value)
+      @app_path=value
+      @run_path=value
+    end
+
     private
 
     def raise_app_path_error

data/spec/apcera/stager/stager_spec.rb

@@ -97,7 +97,16 @@ describe Apcera::Stager do
 
       it "should decompress the package to a supplied path" do
         @stager.extract(@appdir)
-        expected_path = File.join(@stager.root_path, @appdir)
+        extracted_path = File.join(@stager.root_path, "staging", @appdir)
+        expected_path = File.join(@stager.root_path, "staging")
+
+        File.exist?(extracted_path).should == true
+        @stager.app_path.should == expected_path
+      end
+
+      it "should decompress the package without a supplied path" do
+        @stager.extract()
+        expected_path = File.join(@stager.root_path, "staging")
         File.exist?(expected_path).should == true
         @stager.app_path.should == expected_path
       end
@@ -125,7 +134,7 @@ describe Apcera::Stager 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
+        @stager.execute("cat #{File.join(@stager.app_path, @appdir, "app", "Gemfile")}").should == true
       end
 
       it "should bubble errors to fail" do
@@ -152,6 +161,15 @@ describe Apcera::Stager do
         @stager.execute_app("cat #{File.join("app", "Gemfile")}").should == true
       end
 
+      it "should execute commands in extracted dir with clean bundler environment" do
+        Bundler.should_receive(:with_clean_env).at_least(:once).and_yield
+
+        @stager.extract()
+
+        @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 }
 
@@ -191,7 +209,7 @@ describe Apcera::Stager do
 
         @stager.extract(@appdir)
 
-        @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("tar czf #{@stager.updated_pkg_path} ./*").and_return
 
         @stager.upload
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apcera-stager-api
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Ellithorpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Apcera Stager API library which makes it super easy to write stagers for