biosphere 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e373f80b998cf5f1833a20208f7772d813ff7e5
-  data.tar.gz: a2078ac110ba457f7717353acf22920c4955ef21
+  metadata.gz: fc7978fc42c73db8148546690ffdc26363814862
+  data.tar.gz: 62ab431bc12cfe129837619a221a2ab22da044d0
 SHA512:
-  metadata.gz: c6c209289f626ca714b57a071e9799ba2a31e8cb8bb7a1235ab7da0d7fc7d56bceed84225dd365a063fc0dd630fe1bf94798b256950c2805541d607552950e87
-  data.tar.gz: 76d440c43416e139bce31b8c85ba27a79eb9d93a62d8bb85ec4f6c98fef6866ff765af2cf0a09109a0018b4b9411433def3a2f5b4e56f9c1372a2db82863a4a2
+  metadata.gz: 5e6c4478856e452ea74f8f6deaa46d9ef75eeb66f7fdc10a07976b235939a8f5d6b235f7d891951c61c74e6b69283292317bbd7d4f28837cf01a8ed1b0c507cd
+  data.tar.gz: 390b6054285459b1870b6e1582d0ce3c1a4dfa147d39764d76277965b38b4a90db43403d33040f4683ba940c0f730a5914d0537c42923002d499b6bf94f8e6fd

data/bin/biosphere

@@ -97,18 +97,30 @@ if options.src
     end
 
     # We need to load the suite once so that we can find the Biosphere settings
-    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?"
+    begin
+        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
+    rescue ::Biosphere::ConfigurationError => e
+        STDERR.puts "Configuration Error: #{e}".colorize(:red)
+        STDERR.puts "Relevant configuration part:"
+        ap e.settings
         exit -1
     end
 
-    if suite.biosphere_settings[:s3_bucket].nil? || suite.biosphere_settings[:s3_bucket].empty? ||
-        suite.biosphere_settings[:state_name].nil? || suite.biosphere_settings[:state_name].empty?
-        puts "\nNo S3 bucket or cluster name defined in configuration, can't continue"
-        exit 1
+    if suite.biosphere_settings[:local] == true
+        localmode = true
+    else
+        localmode = false
+        if suite.biosphere_settings[:s3_bucket].nil? || suite.biosphere_settings[:s3_bucket].empty? ||
+            suite.biosphere_settings[:state_name].nil? || suite.biosphere_settings[:state_name].empty?
+            puts "\nNo S3 bucket or cluster name defined in configuration, can't continue"
+            exit 1
+        end
+        s3 = S3.new(suite.biosphere_settings[:s3_bucket], suite.biosphere_settings[:state_name])
+        s3.retrieve("#{options.build_dir}/state.node")
     end
-    s3 = S3.new(suite.biosphere_settings[:s3_bucket], suite.biosphere_settings[:state_name])
-    s3.retrieve("#{options.build_dir}/state.node")
 
     # This will update the state which is already passed to the suite.
     state.filename = "#{options.build_dir}/state.node"
@@ -149,7 +161,7 @@ if ARGV[0] == "build" && options.src
 
     puts "Wrote #{count} files into #{options.build_dir}"
     state.save()
-    s3.save("#{options.build_dir}/state.node")
+    s3.save("#{options.build_dir}/state.node") unless localmode
 
 elsif ARGV[0] == "plan" && options.src
     suite.evaluate_plans()
@@ -176,7 +188,7 @@ elsif ARGV[0] == "action" && options.src
         STDERR.puts "Could not find action #{ARGV[1]}"
     end
     state.save()
-    s3.save("#{options.build_dir}/state.node")
+    s3.save("#{options.build_dir}/state.node") unless localmode
 
 elsif ARGV[0] == "deployment" && options.src
 
@@ -198,10 +210,14 @@ elsif ARGV[0] == "statereset" && options.src
         state = Biosphere::State.new
         state.filename = "#{options.build_dir}/state.node"
         state.save()
-        s3.save("#{options.build_dir}/state.node")
+        s3.save("#{options.build_dir}/state.node") unless localmode
     end
 
 elsif ARGV[0] == "commit" && options.src
+    if localmode
+        STDERR.puts "commit not supported in local mode (set in Settings :biosphere[:local] = true"
+        exit -1
+    end
 
     if !ARGV[1]
         puts "Please specify deployment name as the second parameter."
@@ -242,7 +258,7 @@ elsif ARGV[0] == "commit" && options.src
     plan.print
 
     targets = plan.get_resources.collect { |x| "-target=#{x}" }.join(" ")
-
+    puts "Targets: #{targets}"
     answer = ""
     while answer.empty? || (answer != "y" && answer != "n")
         print "\nDoes the plan look reasonable? (Answering yes will apply the changes) y/n: "
@@ -292,6 +308,10 @@ elsif ARGV[0] == "commit" && options.src
     s3.release_lock()
 
 elsif ARGV[0] == "destroy" && options.src
+    if localmode
+        STDERR.puts "destroy not supported in local mode (set in Settings :biosphere[:local] = true"
+        exit -1
+    end
 
     if !ARGV[1]
         puts "Please specify deployment name as the second parameter."
@@ -324,9 +344,19 @@ elsif ARGV[0] == "destroy" && options.src
     s3.release_lock()
 
 elsif ARGV[0] == "lock"
+    if localmode
+        STDERR.puts "lock not supported in local mode (set in Settings :biosphere[:local] = true"
+        exit -1
+    end
+
     s3.set_lock()
 
 elsif ARGV[0] == "unlock"
+    if localmode
+        STDERR.puts "unlock not supported in local mode (set in Settings :biosphere[:local] = true"
+        exit -1
+    end
+
     s3.release_lock()
 
 else

data/lib/biosphere.rb

@@ -5,6 +5,7 @@ require 'deep_merge'
 
 require "biosphere/ipaddressallocator"
 require "biosphere/version"
+require "biosphere/exceptions"
 require "biosphere/settings"
 require "biosphere/node"
 require "biosphere/state"

data/lib/biosphere/exceptions.rb

@@ -0,0 +1,16 @@
+
+class Biosphere
+
+    class ConfigurationError < ::RuntimeError
+
+        attr_reader :settings
+
+        def initialize(msg, settings)
+            super(msg)
+
+            @settings = settings
+        end
+    end
+
+end
+

data/lib/biosphere/settings.rb

@@ -81,6 +81,9 @@ class Biosphere
 
             # Finds files from relative path
             def find_files(p)
+                if !$current_biosphere_path_stack
+                    $current_biosphere_path_stack = "."
+                end
                 relative_path = $current_biosphere_path_stack + "/" + p
                 entries = Dir[(relative_path)] - [".", ".."]
                 return entries

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.2.8"
+  Version = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -180,6 +180,7 @@ files:
 - lib/biosphere/cli/terraformplanning.rb
 - lib/biosphere/cli/updatemanager.rb
 - lib/biosphere/deployment.rb
+- lib/biosphere/exceptions.rb
 - lib/biosphere/ipaddressallocator.rb
 - lib/biosphere/kube.rb
 - lib/biosphere/mixing/from_file.rb