biosphere 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5334e29f8810799170f770884df905fdf69475fb
-  data.tar.gz: 81106994d0ce532dd43c7353f0380b5d3b886167
+  metadata.gz: 647938b02f253417fc66f2c441c07ab40ab6b79e
+  data.tar.gz: 48d3703a751c9395c977f7f390b1c7d2db5e24be
 SHA512:
-  metadata.gz: 792641b8e3ddda7b06d1a1755e7e3a674d63c36b4ee639cb39dee408cf2246a9c8adaf87ad3237ff9aa9d12b115c294b4175ee0e6351e3ebce6649eea40fd3ed
-  data.tar.gz: 5ffbf10cd0629e36c6f1f88b5fd64969f0e07cb929f3cf3b1d1aa1ee94df258b697f41cc248c41ad762ac259a53666a62a25295d576d93ddc94419a0e9c1383e
+  metadata.gz: c98f1859dba18cbb6f3b75c4ce62757a6c810e102b77e3e5c932b3c8f762df452f63a8f21a4ba228f53d55eaf47343099dd162efa5ca3747a98feb7379677ebc
+  data.tar.gz: b555e8c058376a6ab67b41a9561f87761f6004856765c0bfba03198d7db3b06b5b93fde64158c81ee62b31f00ef733c1828ff4953086a6f4903be4734f9908f0

data/bin/biosphere

@@ -164,7 +164,7 @@ if ARGV[0] == "build" && options.src
         count = count + 1
     end
 
-    puts "Wrote #{count} files into #{options.build_dir}"
+    puts "Wrote #{count} files under #{options.build_dir}"
     state.save()
     s3.save("#{options.build_dir}/state.node") unless localmode
 
@@ -244,7 +244,7 @@ elsif ARGV[0] == "commit" && options.src
 
     s3.set_lock()
     s3.retrieve("#{options.build_dir}/#{deployment}.tfstate")
-    tf_plan_str = %x( terraform plan -state=#{options.build_dir}/#{deployment}.tfstate -out #{options.build_dir}/plan #{options.build_dir}  )
+    tf_plan_str = %x( terraform plan -state=#{options.build_dir}/#{deployment}.tfstate -out #{options.build_dir}/plan #{options.build_dir}/#{deployment}  )
     tfplanning = Biosphere::CLI::TerraformPlanning.new()
     plan = tfplanning.generate_plan(suite.deployments[deployment], tf_plan_str)
     if !plan
@@ -278,7 +278,7 @@ elsif ARGV[0] == "commit" && options.src
         #tf_apply = %x( terraform apply -state=#{state_file} #{options.build_dir})
         #puts "\n" + tf_apply
         begin
-            PTY.spawn("terraform apply #{targets} -state=#{state_file} #{options.build_dir}") do |stdout, stdin, pid|
+            PTY.spawn("terraform apply #{targets} -state=#{state_file} #{options.build_dir}/#{deployment}") do |stdout, stdin, pid|
             begin
                 stdout.each { |line| puts line }
                 rescue Errno::EIO
@@ -292,7 +292,7 @@ elsif ARGV[0] == "commit" && options.src
         command_output = ""
         begin
             puts "Refreshing terraform outputs"
-            PTY.spawn("terraform refresh -state=#{state_file} #{options.build_dir}") do |stdout, stdin, pid|
+            PTY.spawn("terraform refresh -state=#{state_file} #{options.build_dir}/#{deployment}") do |stdout, stdin, pid|
             begin
                 stdout.each { |line| command_output << line }
                 rescue Errno::EIO

data/lib/biosphere/suite.rb

@@ -91,9 +91,14 @@ class Biosphere
             end
 
             @deployments.each do |name, deployment|
+                dir = destination_dir + "/" + deployment.name
+                if !File.directory?(dir)
+                    Dir.mkdir(dir)
+                end
+
                 json_name = deployment.name + ".json.tf"
                 str = deployment.to_json(true) + "\n"
-                destination_name = destination_dir + "/" + json_name
+                destination_name = dir + "/" + json_name
                 File.write(destination_name, str)
 
                 yield deployment.name, destination_name, str, deployment if block_given?

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.2.10"
+  Version = "0.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Juho Mäkinen