sistero 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c05a40e7cbaf966250545adca8bedcaeab750a7
-  data.tar.gz: 28d77522246e1e102e90bb25919fedd756bd8fe9
+  metadata.gz: e493aa279919d567e6a6eb2d0980dcd3ec412374
+  data.tar.gz: f222d218205101e767a903382b34928636e3a5cd
 SHA512:
-  metadata.gz: 2eadc9dcdc499285f719f8798e6fbcb64192eb816cd778f01df49097ee11f5b4d2ce5bde18f8bfbda735268ff68ba1dfc5af5fab19186319338a18d83e08f2a6
-  data.tar.gz: 40c4a034b59468d9dc3201f0b69abe04a0239d884749c967311bb310fe5349e0c335d3c6a390e85f03d09e78f4a40bee85d0a18297ba519ed9728027cfce7409
+  metadata.gz: 04e07114fafb07c5ca60ec829c9c7664cab53c6d7783bd4fecd38a8da8e79334cbf4c32569f34daad8b7f08b363cda31f1ae4b3dcb450054403381966d37dc0f
+  data.tar.gz: 16799fcaa0100ae937347ca44eb52d4d6cc5a76ae9a952acb04eba4711e24320a8fa891fbbe2c8ab40ebb91d6515e2b0d87e1e121ea4ddeb424397e3551da630

data/bin/sistero

@@ -22,6 +22,7 @@ module Sistero::Command
       end
 
       op.on '-c', '--config file', 'override path to config file', 'cfg_file_path'
+      op.on '-d', '--directory dir', 'set working dir', 'directory'
 
       op.subcommand 'ssh [vm]', 'ssh to vm' do |subop|
         subop.on '-o val', 'add ssh options', 'ssh_options'
@@ -48,7 +49,10 @@ module Sistero::Command
     end
 
     command_cfg = OpenStruct.new config[command]
-    sistero = Sistero::Instance.new({ cfg_file_path: config.cfg_file_path })
+    sistero = Sistero::Instance.new({
+      cfg_file_path: config.cfg_file_path,
+      directory: config.directory
+    })
 
     case command
     when 'ssh'

data/lib/sistero/config.rb

@@ -1,7 +1,9 @@
 require "yaml"
-APP_NAME = "sistero"
 
 module Sistero
+  CONFIG_FILE_NAME = 'sistero.yaml'
+  APP_NAME = "sistero"
+
   VM_KEYS = [:name, :size, :region, :image, :access_token, :user_data, :private_networking,
              :ssh_keys, :ssh_options, :ssh_user ]
 
@@ -36,8 +38,19 @@ module Sistero
       # read defaults from config file
       @cfg_file_path = opts[:cfg_file_path]
       unless @cfg_file_path
-        @cfg_file_path = 'sistero.yaml'
-        @cfg_file_path = "#{ENV['HOME']}/.config/#{APP_NAME}" unless File.exists? @cfg_file_path
+        directory = opts[:directory] || '.'
+
+        for n in 0..100
+          cfg_file_path = File.join(directory, CONFIG_FILE_NAME)
+          if File.exists? cfg_file_path
+            @cfg_file_path = cfg_file_path
+            break
+          end
+          directory = File.dirname directory
+          break if directory == '/'
+        end
+
+        @cfg_file_path ||= "#{ENV['HOME']}/.config/#{APP_NAME}"
       end
 
       @defaults = VM.new

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Pike