biosphere 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc111ae02adaf39cb2c1c0af5d37b0e575da7d4
-  data.tar.gz: ec007c7457d7991a4e7c97984e5373cf9a79e568
+  metadata.gz: 88020767bf9108cca1476004ddf0341b5feafe88
+  data.tar.gz: 063cb05d2a0cba8246a49cccdf0d7c396e18ddcb
 SHA512:
-  metadata.gz: 52a249f0af8c6e67059990fc0bfff70b6fa053e8fb479597a3aa8480d2fa5229b5eb4a26c4cb552afe556e0d663ef22d1f7718097a24b6b98eda1844b6de7f84
-  data.tar.gz: 8094c19e30d6ca4b40ec9a4a7ef6eb0bc06cac54ca7e3a58a38b93be8fa6cde0b0bc6afccd68c5e3245259acd539c54de07090b4cba7fb801d32dbfc5e6939f7
+  metadata.gz: 97728c5ec497caa18604445a6bea2e2adb0cde5f0c906f98a24d97dd62eece20c28519acd4e7072dd8fbf9937594a43e970269e06d28e18b1a325e4a3f8348e9
+  data.tar.gz: e900d8d19297fe53e4d35d4b2c8b1135d99d4dd80b2174a0b1018e0b631693b8b77650965ac9878bdd4242e7ba12739357ca9939f7e6c672564ae20ad6ec971c

data/bin/biosphere

@@ -7,6 +7,7 @@ require 'pp'
 require "awesome_print"
 require 'colorize'
 require 'biosphere/s3.rb'
+require 'pty'
 
 class BiosphereOpts
 
@@ -89,7 +90,7 @@ if options.src
         STDERR.puts "Loading suite from current directory (#{File.expand_path(options.src)}). Use --src to change the path"
     end
 
-    if suite.load_all(options.src) == 0
+    if suite.load_all(options.src) == 0 || suite.deployments.size == 0
         STDERR.puts "No files found. Are you in the right directory where your biosphere .rb files are?"
         exit -1
     end
@@ -197,8 +198,19 @@ elsif ARGV[0] == "commit" && options.src
     elsif answer == "y"
         puts "\nApplying the changes (this may take several minutes)"
         state_file = "#{options.build_dir}/#{deployment}.tfstate"
-        tf_apply = %x( terraform apply -state=#{state_file} #{options.build_dir})
-        puts "\n" + tf_apply
+        #tf_apply = %x( terraform apply -state=#{state_file} #{options.build_dir})
+        #puts "\n" + tf_apply
+        begin
+            PTY.spawn("terraform apply -state=#{state_file} #{options.build_dir}") do |stdout, stdin, pid|
+            begin
+                stdout.each { |line| puts line }
+                rescue Errno::EIO
+                end
+            end
+        rescue PTY::ChildExited
+            puts "The child process exited!"
+        end
+
         puts "Loading outputs for #{deployment} from #{state_file}"
         suite.deployments[deployment].load_outputs(state_file)
         state.save()

data/lib/biosphere/kube.rb

@@ -32,6 +32,7 @@ class Biosphere
 
                 @clients << ::Kubeclient::Client.new("#{hostname}/api" , "v1", ssl_options: ssl_options)
                 @clients << ::Kubeclient::Client.new("#{hostname}/apis/extensions/" , "v1beta1", ssl_options: ssl_options)
+                @clients << ::Kubeclient::Client.new("#{hostname}/apis/batch/" , "v2alpha1", ssl_options: ssl_options)
 
                 @clients.each { |c| c.discover }
             end

data/lib/biosphere/settings.rb

@@ -37,7 +37,7 @@ class Biosphere
                 if settings
                     c = @settings_hash ||= ::Hash.new
                     c = DeepDup.deep_dup(c)
-                    c.deep_merge!(settings)
+                    c.deep_merge!(settings, {:overwrite_arrays => true})
                     @settings_hash = c
                 end
                 return @settings_hash

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.1.7"
+  Version = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec