lxdev 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c603e8b103efda46294c12b2fd712467c36acbab
-  data.tar.gz: 46e2fdf820c4a1991e393a9242d3c86a7c6d50fa
+  metadata.gz: f40399ea2c4422f9a5b4b789d1b9347721fbc5e3
+  data.tar.gz: 6dc6ebd630f013876eb045ff166fb986efce1e0b
 SHA512:
-  metadata.gz: 7cd7b1a83e49543fb0f0efbd71c8910e0cdf812c31c369a65651c6acb18f8251b55b2b676344d431166ceb27b6a3dad95275058cb6aea2bcdac8589aafba75c4
-  data.tar.gz: 12b3fd2021f8a09e39c332093c6e5e4c0dfbbe9a489a979e09551e31cac2115c4c3afd7a563e724662584e4693a7ce93980c1950ef14694203c627f9acdb2b93
+  metadata.gz: fe19314ba8389725a6153c0529135a2a63404d73f5ebeba49a36bd8a07e41a0e65fdbb7bd9a7a0617ed7cd35a636b6bac9e71f476fb7fcef0477f24d0df061d0
+  data.tar.gz: 3edf3032409230181054edb3a27f9acb643c5a0af3ae0aa8387b90a03b53923bced72eec0ac17b7cac92063d100e0241f72e1a573241cbfa9c9cbaacad7228c9

data/bin/lxdev

@@ -3,6 +3,7 @@ require 'lxdev/main'
 require 'optparse'
 
 $config_file = 'lxdev.yml'
+$state_file = 'state'
 
 def option_parser
   opt_parser = OptionParser.new do |opts|
@@ -19,9 +20,9 @@ def option_parser
     end
 
     opts.on("-c F", "--config F", String, "Specify config file, defaults to lxdev.yml") do |filename|
-      puts filename
       unless filename.nil?
         $config_file = filename
+        $state_file = format("%s_%s", 'state', File.basename($config_file, '.yml'))
       end
     end
 
@@ -106,7 +107,7 @@ end
 
 
 option_parser
-lxdev = LxDev::Main.setup($config_file)
+lxdev = LxDev::Main.setup($config_file, $state_file)
 if lxdev
   execute_main_command(lxdev)
   lxdev.save_state

data/lib/lxdev/main.rb

@@ -9,9 +9,10 @@ module LxDev
     WHITELISTED_SUDO_COMMANDS = ["lxc", "redir", "kill"]
     SHELLS                    = ["bash", "zsh", "sh", "csh", "tcsh", "ash"]
     BOOT_TIMEOUT              = 30
-    VERSION                   = '0.1.4'
+    VERSION                   = '0.1.5'
 
-    def initialize(config_file)
+    def initialize(config_file, state_file)
+      @state_file = format(".lxdev/%s", state_file)
       @uid    = System.exec("id -u").output.chomp
       @gid    = System.exec("id -g").output.chomp
       @config = YAML.load_file(config_file)
@@ -21,7 +22,7 @@ module LxDev
       @ports  = @config['box']['ports'] || {}
       Dir.mkdir('.lxdev') unless File.directory?('.lxdev')
       begin
-        @state = YAML.load_file('.lxdev/state')
+        @state = YAML.load_file(@state_file)
       rescue
         @state = Hash.new
       end
@@ -30,13 +31,13 @@ module LxDev
       exit 1
     end
 
-    def self.setup(config_file = 'lxdev.yml')
+    def self.setup(config_file = 'lxdev.yml', state_file = 'state')
       self.check_requirements
       unless lxd_initialized?
         puts "Please run 'lxd init' and configure LXD first"
         return false
       end
-      lxdev = Main.new(config_file)
+      lxdev = Main.new(config_file, state_file)
       unless lxdev.set_ssh_keys
         puts "No ssh keys detected. Make sure you have an ssh key, a running agent, and the key added to the agent, e.g. with ssh-add."
         return false
@@ -45,7 +46,7 @@ module LxDev
     end
 
     def save_state
-      File.open('.lxdev/state', 'w') {|f| f.write @state.to_yaml} unless @state.empty?
+      File.open(@state_file, 'w') {|f| f.write @state.to_yaml} unless @state.empty?
     end
 
     def set_ssh_keys
@@ -89,7 +90,7 @@ module LxDev
     def up
       do_provision = false
       unless @state.empty?
-        puts "Container state .lxdev/state exists, is it running? If not it might have stopped unexpectedly. Please remove the file before starting."
+        puts "Container state #{@state_file} exists, is it running? If not it might have stopped unexpectedly. Please remove the file before starting."
         exit 1
       end
       if get_container_status.empty?
@@ -211,7 +212,7 @@ module LxDev
     end
 
     def remove_state
-      File.delete('.lxdev/state') if File.exists?('.lxdev/state')
+      File.delete(@state_file) if File.exists?(@state_file)
       @state = {}
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxdev
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Christian Lønaas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json