lxdev 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bd005fcf499291c992c0176018a0feac0e2fca7bc8a130801d2089a92dabc313
-  data.tar.gz: fb3a2b1facc6caedd1928dd03f0c6cd710a99bfdc30355721978d9146e9616bb
+SHA1:
+  metadata.gz: c603e8b103efda46294c12b2fd712467c36acbab
+  data.tar.gz: 46e2fdf820c4a1991e393a9242d3c86a7c6d50fa
 SHA512:
-  metadata.gz: 67cd321fc6066831e289c92887566034a452c8128d36be956c5f7021ebf618ab31d66abb9ef62ae02f745b64519fce38c069a00bed4791e00de9e9cd22183f87
-  data.tar.gz: 66be27cb60e0d0442b73c5be27d128aa8222614b62b53f1d2f300ed60978aa27b3ad439a9b9b6434946ae0cc4d169eea39333283c5e4107f69bcc87c1ebb8f11
+  metadata.gz: 7cd7b1a83e49543fb0f0efbd71c8910e0cdf812c31c369a65651c6acb18f8251b55b2b676344d431166ceb27b6a3dad95275058cb6aea2bcdac8589aafba75c4
+  data.tar.gz: 12b3fd2021f8a09e39c332093c6e5e4c0dfbbe9a489a979e09551e31cac2115c4c3afd7a563e724662584e4693a7ce93980c1950ef14694203c627f9acdb2b93

data/bin/lxdev

@@ -2,6 +2,8 @@
 require 'lxdev/main'
 require 'optparse'
 
+$config_file = 'lxdev.yml'
+
 def option_parser
   opt_parser = OptionParser.new do |opts|
     opts.banner = "Usage: lxdev [options] command"
@@ -16,6 +18,13 @@ def option_parser
       exit
     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
+      end
+    end
+
   end
   opt_parser.separator ""
   opt_parser.separator <<-EOS
@@ -97,7 +106,7 @@ end
 
 
 option_parser
-lxdev = LxDev::Main.setup()
+lxdev = LxDev::Main.setup($config_file)
 if lxdev
   execute_main_command(lxdev)
   lxdev.save_state

data/lib/lxdev/main.rb

@@ -2,18 +2,19 @@ require 'yaml'
 require 'json'
 require 'terminal-table'
 require 'lxdev/system'
+require 'tempfile'
 
 module LxDev
   class Main
     WHITELISTED_SUDO_COMMANDS = ["lxc", "redir", "kill"]
     SHELLS                    = ["bash", "zsh", "sh", "csh", "tcsh", "ash"]
     BOOT_TIMEOUT              = 30
-    VERSION                   = '0.1.3'
+    VERSION                   = '0.1.4'
 
-    def initialize
+    def initialize(config_file)
       @uid    = System.exec("id -u").output.chomp
       @gid    = System.exec("id -g").output.chomp
-      @config = YAML.load_file('lxdev.yml')
+      @config = YAML.load_file(config_file)
       @name   = @config['box']['name']
       @image  = @config['box']['image']
       @user   = @config['box']['user']
@@ -25,17 +26,17 @@ module LxDev
         @state = Hash.new
       end
     rescue Errno::ENOENT
-      puts "lxdev.yml not found"
+      puts "#{config_file} not found"
       exit 1
     end
 
-    def self.setup
+    def self.setup(config_file = 'lxdev.yml')
       self.check_requirements
       unless lxd_initialized?
         puts "Please run 'lxd init' and configure LXD first"
         return false
       end
-      lxdev = Main.new
+      lxdev = Main.new(config_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
@@ -359,6 +360,7 @@ module LxDev
         cmd_with_path = System.exec("which #{cmd}").output.chomp
         content << "#{user} ALL=(root) NOPASSWD: #{cmd_with_path}"
       end
+      content << "\n"
       puts <<-EOS
 !! WARNING !!
 This will create a file, /etc/sudoers.d/lxdev,
@@ -378,8 +380,17 @@ doing, this can be dangerous and insecure.
         puts "Not creating sudoers file"
         return
       end
-      System.exec(%{printf '#{content.join("\n")}\n' | sudo tee /etc/sudoers.d/lxdev})
-      System.exec("sudo chmod 0440 /etc/sudoers.d/lxdev")
+      temp_file = Tempfile.create('lxdev-sudoers')
+      temp_file.write(content.join("\n"))
+      temp_file_name = temp_file.to_path
+      temp_file.close
+      unless System.exec("visudo -c -f #{temp_file_name}").exitstatus == 0
+        puts "Generated sudoers file contains errors, aborting."
+        exit 1
+      end
+      System.exec("sudo chown root:root #{temp_file_name}")
+      System.exec("sudo chmod 0440 #{temp_file_name}")
+      System.exec("sudo mv #{temp_file_name} /etc/sudoers.d/lxdev")
       puts "Created sudoers file."
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxdev
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christian Lønaas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Automagic development environment with LXD