gordon 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fd96ba18bed624cc7d5d28d282c33fb16a1bc1a
-  data.tar.gz: dea16e96a56887b85e6b50104b3b84151394620c
+  metadata.gz: 070d6226cb7d4f623edc73bf8a5623b8a33df00e
+  data.tar.gz: 11ad4f9d175ca123ba3a9fc64bce415af8d02515
 SHA512:
-  metadata.gz: 458188db5ac52c3f5550db6f98d14ec1e3c79cc4d3479ee5112064bb46b5f9e792c0c072869e0939cca2113a05b1468e1cc1c471667a1fa60ffc7dff29383f58
-  data.tar.gz: a689b7b0523ea330e5b845f27c2db5dd8c850b4cb960e993fbdef7fd0e9f12c67373c00fd57cbb8e416a4f2b007de5bc2221044b36bddb021760f5f2f3ddfb7b
+  metadata.gz: 90fddfedda4dfb3a8743e1596188df717e291fbba9b1774c50f3827b721f21342d4d47172a79290874c70dda354f11a072cc15d1c26a86547c1eed305cb3e3cf
+  data.tar.gz: e27c7021854f4c90eeb982b8a9efd2c36e5b26b86c7e40ec2c8f64a5ff557a498e5e671dcdbf89cc03b028839fa1bc4e9aafa8dec6774ce6d1e4968c0a30b706

data/lib/gordon/cooker.rb

@@ -1,10 +1,11 @@
+require 'fileutils'
+
 module Gordon
   class Cooker
     attr_reader :recipe, :options
 
-    FPM_COOKERY_COMMAND   = 'fpm-cook'
-    FPM_COOKERY_CACHE_DIR = '/tmp/gordon/cache'
-    FPM_COOKERY_BUILD_DIR = '/tmp/gordon/build'
+    FPM_COOKERY_COMMAND     = 'fpm-cook'
+    FPM_COOKERY_WORKING_DIR = '/tmp/gordon'
 
     def initialize(recipe)
       @recipe = recipe
@@ -19,12 +20,9 @@ module Gordon
     private
 
     def clean
-      cook_args = get_command_args
-
-      cook_args << "clean"
-      cook_args << recipe.application_template_path
-
-      execute(cook_args)
+      # fpm-cook clean command only cleans tmp-build and tmp-dest folders
+      # and don't include cache dir :(
+      FileUtils.rm_rf(get_working_path)
     end
 
     def package
@@ -36,6 +34,14 @@ module Gordon
       execute(cook_args)
     end
 
+    def get_working_path
+      app_path = File.expand_path(options.app_source)
+      app_name = File.basename(app_path)
+      tmp_path = File.join(FPM_COOKERY_WORKING_DIR, app_name)
+
+      tmp_path
+    end
+
     def get_command_args
       cook_args = []
 
@@ -43,8 +49,8 @@ module Gordon
 
       cook_args << "--target #{options.package_type}"
       cook_args << "--pkg-dir #{File.expand_path(options.output_dir)}"
-      cook_args << "--cache-dir #{File.expand_path(FPM_COOKERY_CACHE_DIR)}"
-      cook_args << "--tmp-root #{File.expand_path(FPM_COOKERY_BUILD_DIR)}"
+      cook_args << "--cache-dir #{File.expand_path(get_working_path)}"
+      cook_args << "--tmp-root #{File.expand_path(get_working_path)}"
       cook_args << "--no-deps"
 
       cook_args

data/lib/gordon/version.rb

@@ -1,3 +1,3 @@
 module Gordon
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/gordon/cooker_spec.rb

@@ -31,32 +31,20 @@ describe Gordon::Cooker do
     Gordon::EnvVars.from_cook(options)
   end
 
+  let(:working_path) do
+    app_name = File.basename File.expand_path(options.app_source)
+    File.join(described_class::FPM_COOKERY_WORKING_DIR, app_name)
+  end
+
   subject { described_class.new(recipe) }
 
   before :each do
-    expect(subject).to receive(:debug).at_least(2).times
+    allow(subject).to receive(:debug)
   end
 
   describe 'cooking a package' do
     it 'cleans fpm-cookery working directory' do
-      clean_command = %W{
-        #{env_vars.join " "}
-        fpm-cook
-        --debug
-        --target
-        #{options.package_type}
-        --pkg-dir
-        #{File.expand_path(options.output_dir)}
-        --cache-dir
-        #{File.expand_path(described_class::FPM_COOKERY_CACHE_DIR)}
-        --tmp-root
-        #{File.expand_path(described_class::FPM_COOKERY_BUILD_DIR)}
-        --no-deps
-        clean
-        #{recipe.application_template_path}
-      }
-
-      expect(Gordon::Process).to receive(:run).with(clean_command.join " ")
+      expect(FileUtils).to receive(:rm_rf).with(working_path)
 
       expect(subject).to receive(:package)
 
@@ -73,9 +61,9 @@ describe Gordon::Cooker do
         --pkg-dir
         #{File.expand_path(options.output_dir)}
         --cache-dir
-        #{File.expand_path(described_class::FPM_COOKERY_CACHE_DIR)}
+        #{File.expand_path(working_path)}
         --tmp-root
-        #{File.expand_path(described_class::FPM_COOKERY_BUILD_DIR)}
+        #{File.expand_path(working_path)}
         --no-deps
         package
         #{recipe.application_template_path}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gordon
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Marcelo Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake