linecook-gem 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fcbbf8a2f1a4dfca38905c660e552633f49b1ca
-  data.tar.gz: d58a50784c8e7e2038f5f28dad508c90f4506d63
+  metadata.gz: c897a173dfc0fbfff66b44853e4d7e5fbf735fb3
+  data.tar.gz: ad92c0dd3f835ea109f2dd2d5024133a91774e00
 SHA512:
-  metadata.gz: 504e54dee55820e677bda8e66c833dfd6e244582e1a129bd0bcf13f5d2077100a61591d76906baa39b48aa644e55587843c1d4658b5ada0bd24cf4a58c72e689
-  data.tar.gz: 71c473b6ae166087f189cff21733672c0b597a3c40b27b1186661966a1a9ebfc61473c83b703e0745d26a9a012d453420ad5be654a06713699eb8752e2e3e4ac
+  metadata.gz: 82ea68ce99f675787d7c03b0c039cf74c0cb28c3715238ccf87440e8833e9dec6c48adbd71e021012655a87f7fedad1e4d54318cd7e0f704ac43fbdc505a2371
+  data.tar.gz: 88072bf2787e866ff4d5ac44301966796ab465c0fe471955034c22cc819e18629d809db97b27c04556d65043e3587dd232e21231e7719f2b5a713de70da4643a

data/lib/linecook/builder/linux_backend.rb

@@ -1,21 +1,11 @@
 module Linecook
   module LinuxBuilder
     extend self
-    LXC_MIN_VERSION = '1.1.4'
 
     def backend
-      check_lxc_version
       config = Linecook.config[:builder]
       images = Linecook.config[:image][:images]
       Linecook::Lxc::Container.new(name: config[:name], home: config[:home], image: config[:image], bridge: true)
     end
-
-    private
-
-    # FIXME: move to dependency check during initial setup if on linux
-    def check_lxc_version
-      version = `lxc-info --version`
-      fail "lxc too old (<#{LXC_MIN_VERSION}) or not present" unless Gem::Version.new(version) >= Gem::Version.new(LXC_MIN_VERSION)
-    end
   end
 end

data/lib/linecook/util/config.rb

@@ -14,6 +14,7 @@ module Linecook
     extend self
     attr_reader :config
 
+    LXC_MIN_VERSION = '1.1.4'
     CONFIG_PATH = File.join(Dir.pwd, 'linecook.yml').freeze # File.expand_path('../../../config/config.yml', __FILE__)
     SECRETS_PATH = File.join(Dir.pwd, 'secrets.ejson').freeze # File.expand_path('../../../config/config.yml', __FILE__)
     LINECOOK_HOME = File.expand_path('~/.linecook').freeze
@@ -81,24 +82,6 @@ module Linecook
       end
     end
 
-    def setup
-      FileUtils.mkdir_p(LINECOOK_HOME)
-      config = {}
-      config.merge!(YAML.load(File.read(DEFAULT_CONFIG_PATH))) if File.exist?(DEFAULT_CONFIG_PATH)
-      File.write(DEFAULT_CONFIG_PATH, YAML.dump(DEFAULT_CONFIG.deep_merge(config)))
-      check_perms if platform == 'darwin'
-    end
-
-    def check_perms
-      fix_perms if (File.stat(Xhyve::BINARY_PATH).uid != 0 || !File.stat(Xhyve::BINARY_PATH).setuid?)
-    end
-
-    def fix_perms
-      puts "Xhyve requires root until https://github.com/mist64/xhyve/issues/60 is resolved\nPlease enter your sudo password to setuid on the xhyve binary"
-      system("sudo chown root #{Xhyve::BINARY_PATH}")
-      system("sudo chmod +s #{Xhyve::BINARY_PATH}")
-    end
-
     def load_config
       @config ||= begin
         config_path = ENV['LINECOOK_CONFIG_PATH'] || CONFIG_PATH
@@ -120,6 +103,32 @@ module Linecook
       end
     end
 
+  private
+
+    def setup
+      FileUtils.mkdir_p(LINECOOK_HOME)
+      config = {}
+      config.merge!(YAML.load(File.read(DEFAULT_CONFIG_PATH))) if File.exist?(DEFAULT_CONFIG_PATH)
+      File.write(DEFAULT_CONFIG_PATH, YAML.dump(DEFAULT_CONFIG.deep_merge(config)))
+      check_perms if platform == 'darwin'
+      check_lxc if platform == 'linux'
+    end
+
+    def check_lxc
+      version = `sudo lxc-info --version`
+      fail "lxc too old (<#{LXC_MIN_VERSION}) or not present" unless Gem::Version.new(version) >= Gem::Version.new(LXC_MIN_VERSION)
+    end
+
+    def check_perms
+      fix_perms if (File.stat(Xhyve::BINARY_PATH).uid != 0 || !File.stat(Xhyve::BINARY_PATH).setuid?)
+    end
+
+    def fix_perms
+      puts "Xhyve requires root until https://github.com/mist64/xhyve/issues/60 is resolved\nPlease enter your sudo password to setuid on the xhyve binary"
+      system("sudo chown root #{Xhyve::BINARY_PATH}")
+      system("sudo chmod +s #{Xhyve::BINARY_PATH}")
+    end
+
     setup
   end
 end

data/lib/linecook/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dale Hamel