stem 0.3.1 → 0.3.3

data/lib/stem/cli.rb

@@ -1,5 +1,7 @@
 require 'optparse'
 
+require 'stem/userdata'
+
 module Stem
   Version = "0.2.1"
 
@@ -15,6 +17,7 @@ module Stem
 
         opts.separator "Examples:"
         opts.separator "  $ stem launch prototype.config prototype-userdata.sh"
+        opts.separator "  $ stem launch examples/lxc-server/lxc-server.json examples/lxc-server/"
         opts.separator "  $ stem list"
         opts.separator "  $ stem create ami-name instance-id"
 
@@ -58,8 +61,18 @@ module Stem
 
     def launch config_file = nil, userdata_file = nil
       abort "No config file" unless config_file
-      userdata = File.new(userdata_file).read() if userdata_file
-      instance = Stem::Instance::launch(JSON.parse(File.new(config_file).read()), userdata)
+      userdata = case
+                   when userdata_file.nil?
+                     nil
+                   when File.directory?(userdata_file)
+                     Userdata.compile(userdata_file)
+                   when File.file?(userdata_file)
+                     File.new(userdata_file).read
+                   else
+                     abort 'Unable to interpret userdata object.'
+                 end
+      conf = JSON.parse(File.new(config_file).read)
+      instance = Stem::Instance.launch(conf, userdata)
       puts "New instance ID: #{instance}"
     end
 

data/lib/stem/instance.rb

@@ -93,24 +93,30 @@ module Stem
         lookup[ami["imageId"]] = name
       end
 
-      puts "------------------------------------------"
-      puts "Instances"
-      puts "------------------------------------------"
-      instances["reservationSet"].each do |r|
-        groups = r["groupSet"].map { |g| g["groupId"] }.join(",")
-        r["instancesSet"].each do |i|
-            name = lookup[i["imageId"]]
-            puts "%-15s %-15s %-15s %-20s %s" % [ i["instanceId"], i["ipAddress"] || "no ip", i["instanceState"]["name"], groups, name ]
+      reservations = instances["reservationSet"]
+      unless reservations.nil? or reservations.empty?
+        puts "------------------------------------------"
+        puts "Instances"
+        puts "------------------------------------------"
+        reservations.each do |r|
+          groups = r["groupSet"].map { |g| g["groupId"] }.join(",")
+          r["instancesSet"].each do |i|
+              name = lookup[i["imageId"]]
+              puts "%-15s %-15s %-15s %-20s %s" % [ i["instanceId"], i["ipAddress"] || "no ip", i["instanceState"]["name"], groups, name ]
+          end
         end
       end
 
-      puts "------------------------------------------"
-      puts "AMIs"
-      puts "------------------------------------------"
-      images = swirl.call "DescribeImages", "Owner" => "self"
-      iwidth = images["imagesSet"].map { |img| img["name"].length }.max + 1
-      images["imagesSet"].each do |img|
-        puts "%-#{iwidth}s %s" % [ img["name"], img["imageId"] ]
+      result = swirl.call "DescribeImages", "Owner" => "self"
+      images = result["imagesSet"]
+      unless images.nil? or images.empty?
+        puts "------------------------------------------"
+        puts "AMIs"
+        puts "------------------------------------------"
+        iwidth = images.map { |img| img["name"].length }.max + 1
+        images.each do |img|
+          puts "%-#{iwidth}s %s" % [ img["name"], img["imageId"] ]
+        end
       end
     end
   end

data/lib/stem/userdata.rb

@@ -48,22 +48,20 @@ module Stem
     def make_zip_shell
       # We'll comment outside here, to keep from wasting valuable userdata bytes.
       # we decompress into /root/userdata, then run userdata.sh
-      header = <<-'SHELL'
-        #!/bin/bash
-        exec >> /var/log/userdata.log 2>&1
-        echo BOOTING `date`
-        UD=~/userdata
-        mkdir -p $UD
-        tail -n +HEADER_LINES "$0" | tar -jx -C $UD -f -
-        cd $UD
-        exec bash userdata.sh
+      header = <<-SHELL
+#!/bin/bash
+exec >> /var/log/userdata.log 2>&1
+date --utc '+BOOTING %FT%TZ'
+UD=~/userdata
+mkdir -p $UD
+sed '1,/^#### THE END$/ d' "$0" | tar -jx -C $UD
+cd $UD
+exec bash userdata.sh
+#### THE END
       SHELL
-      process_header(header) + %x{tar --exclude *.stem -cv - . | bzip2 --best -}
+      header + %x{tar --exclude *.stem -cv . | bzip2 --best -}
     end
 
-    def process_header(shell)
-      shell.gsub(/HEADER_LINES/, (shell.split("\n").size + 1).to_s).gsub(/^ +/,'')
-    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stem
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Peter van Hardenberg