cloudspin-stack 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4170afe9007ab5cebf6f4e58af38922acc5fce87
-  data.tar.gz: 8c5c4ce80a36b5466f00a6b12c6128a9d39876a8
+  metadata.gz: 5e178ce62e9a31330889dc2267257be6ed7ad348
+  data.tar.gz: ebc785974df577a49b9397576e1b8b837683ad19
 SHA512:
-  metadata.gz: da540b6e8568124062af22ac849116136ab90bce97ad40ef05a9f3b8dd4689315af237503e4ee4b1453d4d64bc0f593c87c3b2f0245b868a007b0a5334c45ef4
-  data.tar.gz: d31bf8166024b87d4637d5b3519a69e9b95a3a853931bccd0eab9583ca7fd902fb8397c9099a536e2b12cace39eab1759034a93e84ebaca6053f89d4defffe33
+  metadata.gz: '09ed7657a6cd3b3768d152b54d9f6388f3b737edc320b19edc2ddb7588181301fd3cea4c50bbe5997e190f6773e994e2910e945f91b1a8992cb9174846ff24f4'
+  data.tar.gz: 9ee0318f4c9eb5452ea459a18314b80fce67b4e4c46531b929af5a99066ce1518212d025f2a2f70175840998b4c7334a4509010c257579b152de1975561148a2

data/lib/cloudspin/cli.rb

@@ -9,28 +9,25 @@ module Cloudspin
       :aliases => '-f',
       :banner => 'YAML-CONFIG-FILE',
       :type => :array,
-      :default => [
-        Util.full_path_from_local('spin-default.yaml'),
-        Util.full_path_from_local('spin-local.yaml')
-      ],
+      :default => ['spin-default.yaml', 'spin-local.yaml'],
       :desc => 'A list of configuration files to load for the stack instance. Values in files listed later override those from earlier files.'
 
     class_option :terraform_source,
       :aliases => '-t',
       :banner => 'PATH',
-      :default => Util.full_path_from_local('./src'),
+      :default => './src',
       :desc => 'Folder with the terraform project source files'
 
     class_option :work,
       :aliases => '-w',
       :banner => 'PATH',
-      :default => Util.full_path_from_local('./work'),
+      :default => './work',
       :desc => 'Folder to create and copy working files into'
 
     class_option :state,
       :aliases => '-s',
       :banner => 'PATH',
-      :default => Util.full_path_from_local('./state'),
+      :default => './state',
       :desc => 'Folder to create and store local state'
 
     desc 'up INSTANCE_ID', 'Create or update the stack instance'
@@ -48,7 +45,7 @@ module Cloudspin
       end
     end
 
-    desc 'down', 'Destroy the stack instance'
+    desc 'down INSTANCE_ID', 'Destroy the stack instance'
     option :dry, :type => :boolean, :default => false
     option :plan, :type => :boolean, :default => false
     def down(id)

data/lib/cloudspin/stack/definition.rb

@@ -15,6 +15,7 @@ module Cloudspin
       end
 
       def self.from_file(specfile)
+        raise "Cloudspin definition file not found: #{specfile}" unless File.exists?(specfile)
         spec_hash = YAML.load_file(specfile)
         stack_spec = symbolize(spec_hash)
         terraform_source_path = File.dirname(specfile)

data/lib/cloudspin/stack/instance.rb

@@ -25,7 +25,7 @@ module Cloudspin
         @stack_definition = stack_definition
         @backend_config = backend_config
         @working_folder = working_folder
-        @statefile_folder = statefile_folder
+        @statefile_folder = Pathname.new(statefile_folder).realdirpath.to_s
         @parameter_values = {}
         @resource_values = {}
       end
@@ -73,7 +73,7 @@ module Cloudspin
           :vars => terraform_variables
         })
         built_command = configured_command.build
-        built_command.to_s
+        "cd #{working_folder} && #{built_command.to_s}"
       end
 
       def up
@@ -98,7 +98,7 @@ module Cloudspin
           :vars => terraform_variables
         })
         built_command = configured_command.build
-        built_command.to_s
+        "cd #{working_folder} && #{built_command.to_s}"
       end
 
       def down
@@ -123,7 +123,7 @@ module Cloudspin
           :vars => terraform_variables
         })
         built_command = configured_command.build
-        built_command.to_s
+        "cd #{working_folder} && #{built_command.to_s}"
       end
 
       def terraform_variables

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

data/lib/cloudspin/stack.rb

@@ -1,5 +1,4 @@
 require 'cloudspin/stack/version'
-require 'cloudspin/util'
 require 'cloudspin/stack/definition'
 require 'cloudspin/stack/instance'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - 'kief '
@@ -105,7 +105,6 @@ files:
 - lib/cloudspin/stack/definition.rb
 - lib/cloudspin/stack/instance.rb
 - lib/cloudspin/stack/version.rb
-- lib/cloudspin/util.rb
 homepage: https://github.com/cloudspinners
 licenses:
 - MIT

data/lib/cloudspin/util.rb

@@ -1,17 +0,0 @@
-module Cloudspin
-  class Util
-    def self.full_path_from_local(relative_path)
-      raw_path = self.raw_path_from_local(relative_path)
-      if File.exists?(raw_path)
-        Pathname.new(raw_path).realpath.to_s
-      else
-        relative_path
-      end
-    end
-
-    def self.raw_path_from_local(relative_path)
-      Dir.pwd + '/' + relative_path
-    end
-  end
-end
-