biosphere 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24435290b475c48cf0a76c9bcb729f4098ae8b0
-  data.tar.gz: 478204f4a3a5f72effaddbaf00c8269cfda567a6
+  metadata.gz: 07a529aa22b0274989393f6105d8ca6e3fda645b
+  data.tar.gz: 055f4a5f72c074c03e338d5cd28b3aaf4c2af184
 SHA512:
-  metadata.gz: ee55dd0ea82d17978174f90e1dd5f020dcda1e048afd3d11527242cbd9720d9785cdf8e677c0b592138f84638d1d0fd0682b6029eeba3ff0f912ac628a73031c
-  data.tar.gz: b9a5467ef26202789c73401d31cf35166b96c035edfb15563b49779712477169537b139556c72c64d4b642ad47d8ebf46490d491d50e9b59df08276303f683e1
+  metadata.gz: 77f8b8cfaf284f335622fce5f853604cbdd4eccb5e758cb1da3bf98556cc000fea73125ff3bfce4f54d65bbfdbb50cb94d739934f5be61e3ee2654f8d4935da1
+  data.tar.gz: 42aea2700cc84a49ac80127ee9762f2c05c74d10883041c81ec3db70902b35e72607d857dc304289f323329bd7d91000c082e01f9f2a919b781d19f225b53f1b

data/bin/biosphere

@@ -64,11 +64,21 @@ end
 
 if options.src
 	suite = Biosphere::Suite.new(options.src)
+	if options.src == "./"
+		STDERR.puts "Loading suite from current directory (#{File.expand_path(options.src)}). Use --src to change the path"
+	end
+
 	suite.load_all()
-else
-	STDERR.puts "No --src set"
 end
 
+if options.build
+	if !File.directory?(options.build)
+		STDERR.puts "Creating build directory #{options.build} because it was missing"
+		Dir.mkdir(options.build)
+	end
+end
+
+
 if ARGV[0] == "json" && options.src
 	suite.evaluate_resources()
 
@@ -90,7 +100,7 @@ end
 
 if ARGV[0] == "plan" && options.src
 	suite.evaluate_plans()
-	ap suite.node
+	ap suite.node, :indent=>-4
 end
 
 if ARGV[0] == "action" && options.src
@@ -98,6 +108,7 @@ if ARGV[0] == "action" && options.src
 
 	context.build_directory = options.build
 
+	STDERR.puts "Executing action #{ARGV[1]}"
 	suite.call_action(ARGV[1], context)
 
 	suite.save_node()

data/lib/biosphere/node.rb

@@ -1,4 +1,5 @@
 require 'pp'
+require 'awesome_print'
 
 class Biosphere
     class Node
@@ -31,4 +32,52 @@ class Biosphere
             return Marshal.dump(self)
         end
     end
-end
+end
+
+module AwesomePrint
+    module Node
+        def self.included(base)
+            base.send :alias_method, :cast_without_node, :cast
+            base.send :alias_method, :cast, :cast_with_node
+        end
+
+        def cast_with_node(object, type)
+            cast = cast_without_node(object, type)
+            if (defined?(::Biosphere::Node)) && (object.is_a?(::Biosphere::Node))
+                cast = :node_instance
+            end
+            cast
+        end
+
+        def awesome_node_instance(object)
+            "#{object.class} #{awesome_hash(object.data)}"
+        end
+        
+    end
+end
+
+module AwesomePrint
+    module IPAddress
+        def self.included(base)
+            base.send :alias_method, :cast_without_ipaddress, :cast
+            base.send :alias_method, :cast, :cast_with_ipaddress
+        end
+
+        def cast_with_ipaddress(object, type)
+            cast = cast_without_ipaddress(object, type)
+            if (defined?(::IPAddress)) && (object.is_a?(::IPAddress))
+                cast = :ipaddress_instance
+            end
+            cast
+        end
+
+        def awesome_ipaddress_instance(object)
+            "#{object.class}(#{object.to_string})"
+        end
+        
+    end
+end
+
+AwesomePrint::Formatter.send(:include, AwesomePrint::Node)
+AwesomePrint::Formatter.send(:include, AwesomePrint::IPAddress)
+

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.0.3"
+  Version = "0.0.4"
 end

metadata

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