asteroid 0.0.1 → 0.0.2

data/lib/asteroid/instance/command.rb

@@ -2,33 +2,39 @@
 module Asteroid
   class Instance
 
-    def eval_command(cmd, env = nil)
-      env ||= template_data
-      cmd = Template.new(:erb).render(cmd, env)
-      cmd, *rest = cmd.split(" ")
-      case cmd.to_sym
-      when :run
-        self.ssh # reconnect
-        command_run(rest.first, env)
-      when :upload
-        from, to, _ = rest
-        command_upload(from, to, env)
-      when :"upload-private-key"
-        name, _ = rest
-        command_upload_private_key(name, env)
-      when :exec
-        script = rest.join(" ")
-        command_exec(script, env)
-      when :config
-        set_or_get, var, val, _ = rest
-        command_config(set_or_get, var, val)
-      else
-        if server.commands[cmd]
-          command_command(cmd, rest, env)
-        else
-          binding.pry
-        end
-      end
+    def render_erb(string, env)
+      Template.new(:erb, string).render(env)
+    end
+
+    def eval_command(cmd)
+
+
+      return aster_environment.eval(cmd)
+
+      # env ||= template_data
+      # cmd = Template.new(:erb, cmd).render(env)
+      # cmd, *rest = cmd.split(" ")
+      # case cmd.to_sym
+      # when :run
+      #   command_run(rest.first, env)
+      # when :upload
+      #   from, to, _ = rest
+      #   command_upload(from, to, env)
+      # when :"upload-private-key"
+      #   name, _ = rest
+      #   command_upload_private_key(name, env)
+      # when :exec
+      #   script = rest.join(" ")
+      #   command_exec(script, env)
+      # when :config
+      #   set_or_get, var, val, _ = rest
+      #   command_config(set_or_get, var, val)
+      # else
+      #   if server.commands[cmd]
+      #     command_command(cmd, rest, env)
+      #   else
+      #   end
+      # end
     end
 
     def template_data
@@ -38,6 +44,7 @@ module Asteroid
     end
 
     def command_command(cmd, args, env)
+      raise "Not here"
       env ||= template_data
       command = server.commands[cmd]
 
@@ -61,7 +68,7 @@ module Asteroid
       env ||= template_data
       filename = File.join(Asteroid::Config.script_dir, '/', yml_script)
       script = File.read(filename)
-      yml = Template.new(:erb).render(script, env)
+      yml = Template.new(:erb, script).render(env)
       data = YAML::load yml
       unless data["steps"]
         raise "No steps in #{filenbame}"
@@ -74,12 +81,36 @@ module Asteroid
 
     def aster_environment
       @aster_environment ||= Aster::Environment.new.tap do |e|
-        e.define_function :run, [] do |arguments|
-          binding.pry
+
+        self.server.commands.each_pair do |name, data|
+          data = case data
+          when Array
+            {args: [], steps: data}
+          when Object
+            data
+          else
+            raise "Commands should be Arrays or arguments or Objects"
+          end
+          
+          commands = Aster::Parser.new.send :parse_lines, data[:steps]
+          e.define_function name, data[:args], commands
         end
 
-        e.define_function :exec, [] do |arguments|
-          binding.pry
+
+        e.define_function :run, [:"..."] do |arguments|
+          command_run(arguments.join(' '))
+        end
+
+        e.define_function :upload, [:"..."] do |(from, to, _)|
+          if command_upload from, to
+            "yes"
+          else
+            "no"
+          end
+        end
+
+        e.define_function :exec, [:"..."] do |arguments|
+          command_exec(arguments.join(' '))
         end
       end    
     end
@@ -94,6 +125,9 @@ module Asteroid
       env ||= template_data
       script = Script.named(script_name)
 
+      # touch ssh
+      self.ssh
+
       if script.nil?
         raise "No script named #{script_name}"
       end
@@ -120,14 +154,15 @@ module Asteroid
 
     def command_upload(from, to, env = nil)
       env ||= template_data
-      from = ConfigFile.new(from)
+      from = FileReference.new(from)
 
       if from.template?
-        from.set_data env
+        from.data = env
       end
 
-      puts from.filename
-      self.scp.upload! from.filename, to
+      puts from.rendered_filename
+
+      self.scp_upload from.rendered_filename, to
     end
 
     def command_exec(command, env = nil)

data/lib/asteroid/instance/scp.rb

@@ -1,8 +1,34 @@
 require 'net/scp'
 
 module Asteroid
+
+  class MockSCP
+
+    def initialize(fs)
+      @fs = fs || {}
+    end
+
+    def upload!(from, to)
+      @fs[to] = File.read(from)
+    end
+
+  end
+
   class Instance
+
+    def scp_upload(from, to)
+      scp.upload! from, to
+    end
+
+    def mock_file_system
+      @mock_file_system ||= {}
+    end
+
     def scp
+      if server.provider.type == :mock
+        return @mock_scp ||= MockSCP.new(mock_file_system)
+      end
+
       if @scp && (@scp.session.transport.port.to_s != self["ssh.port"] || (@scp.session.transport.options[:user] != self["login.username"]))
         @scp = nil
       end

data/lib/asteroid/instance/ssh.rb

@@ -17,11 +17,12 @@ module Asteroid
       if @ssh && (@ssh.transport.port.to_s != self["ssh.port"] || (@ssh.transport.options[:user] != self["login.username"]))
         @ssh = nil
       end
+
       @ssh ||= Net::SSH.start(
         ip_address, 
         self["login.username"], 
         port: self["ssh.port"].to_i,
-        :keys => [server.ssh_key_filename]
+        :keys => [server.ssh_key.private.filename]
       )
     end
     

data/lib/asteroid/instance/vars.rb

@@ -1,4 +1,4 @@
-
+require 'fileutils'
 
 module Asteroid
 
@@ -26,7 +26,10 @@ module Asteroid
     end
 
     def config_filename
-      File.join(Asteroid::Config.instance_config_dir, "/instance_#{@id}.yml")
+      unless File.directory?(Asteroid::Config.secret_instance_dir)
+        FileUtils.mkdir Asteroid::Config.secret_instance_dir
+      end
+      File.join(Asteroid::Config.secret_instance_dir, "/instance_#{@id}.yml")
     end
 
     def load_config_data

data/lib/asteroid/key_reference.rb

@@ -0,0 +1,45 @@
+
+
+module Asteroid
+  class KeyReference
+    
+    class << self
+      def search_paths
+        @search_paths ||= []
+      end
+    end
+
+    def initialize(name)
+      @name = name
+
+      @public  = nil
+      @private = nil
+
+      self.class.search_paths.each do |path|
+        if @public.nil?
+          key = File.join(path, "#{@name}.pub")
+          if File.exists? key
+            @public = key
+          end
+        end
+
+        if @private.nil?
+          key = File.join(path, "#{@name}")
+          if File.exists? key
+            @private = key
+          end
+        end
+      end
+    end
+
+    def public
+      @public && FileReference.new(@public)
+    end
+
+    def private
+      @private && FileReference.new(@private)
+    end
+
+  end
+end
+

data/lib/asteroid/provider/abstract.rb

@@ -21,17 +21,32 @@ module Asteroid
         @config = config
       end
 
+      def type
+        self.class.type
+      end
+
       def self.type
         self.to_s.split('::').last.underscore.to_sym
       end
 
       def instances
-        
+        []        
       end
       
       def destroy_instance(instance)
       end
 
+      protected
+
+        def require_attribute(o, att, message)
+          if o[att].nil?
+            raise [
+              "Can't create instance on #{instance_name} because #{message}:",
+              "Add Add #{att} to your server config .yml\n #{o.inspect}"
+              ].join(' ')
+          end
+        end
+
     end
   end
 end

data/lib/asteroid/provider/digital_ocean.rb

@@ -26,17 +26,36 @@ module Asteroid
       end
 
       def create_instance(server)
+
+        instance_options = server.instance_options
+
+        require_attribute instance_options, 
+                          :size_id,
+                          "needs size of droplet"
+
+        require_attribute instance_options,
+                          :image_id, 
+                          "needs starting image for droplet"
+
+        require_attribute instance_options, 
+                          :region_id, 
+                          "needs region for droplet"
+
+        require_attribute instance_options, 
+                          :ssh_key_ids, 
+                          "needs SSH key registered for droplet"
+
         instance = Digitalocean::Droplet.create(
-          name: server.instance_name, 
-          size_id: server.attributes[:size_id], 
-          image_id: server.attributes[:image_id], 
-          region_id: server.attributes[:region_id], 
-          ssh_key_ids: server.attributes[:ssh_key_ids],
+          name: server.generate_instance_name, 
+          size_id: instance_options[:size_id], 
+          image_id: instance_options[:image_id], 
+          region_id: instance_options[:region_id], 
+          ssh_key_ids: instance_options[:ssh_key_ids],
           private_networking: true
         )
 
         if instance.status == "OK"
-          Instance.new instance.droplet.merge(provider: self)
+          Instance.new instance.droplet.marshal_dump.merge(provider: self)
         else
           nil
         end
@@ -61,6 +80,16 @@ module Asteroid
       def reboot_instance(instance)
       end
 
+      private
+
+        def provider_name
+          "DigitalOcean"
+        end
+
+        def instance_name
+          "Droplet"
+        end
+
     end
   end
 end

data/lib/asteroid/provider/mock.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module Asteroid
   module Provider
     class Mock < Abstract
@@ -6,20 +8,23 @@ module Asteroid
         (0..3).to_a.map{|a| rand(255)}.join(".")
       end
 
+      def self.clear!
+        FileUtils.rm filename if File.exists? filename
+      end
+
+      def self.filename
+        File.join(File.dirname(__FILE__), '../../../world.yml')
+      end
+
       def initialize(config = {})
-        @config = config || {}
-        @config[:filename] ||= File.join(File.dirname(__FILE__), '../../../world.yml')
-          
-        begin
-          @world = YAML::load_file @config[:filename]
-        rescue
-          puts "No such file #{@config[:filename]}"
-          @world = {}
-        end
+        @config = config
+        @config[:filename] ||= self.class.filename
+        
+        load_world
       end
 
       def instances
-        @config[:instances] || []
+        @world[:instances] ||= []
       end
       
       def create_instance(server)
@@ -27,23 +32,40 @@ module Asteroid
           name: server.generate_instance_name,
           id: SecureRandom.hex(5),
           ip_address: self.class.ip_address,
+          type: server.type
+        }
+
+        self.instances << instance 
+        save_world
+
+        Instance.new instance.merge({
           provider: self,
-          type: server.type,
           server: server
-        }
-        Instance.new instance
+        })
       end
 
       def destroy_instance(instance)
-
+        self.instances.delete_if do |i|
+          i[:id] == i.id
+        end
+        save_world
       end
 
       private
 
+        def load_world 
+          begin
+            @world = YAML::load_file @config[:filename]
+          rescue
+            @world = {}
+          end
+        end
+
         def save_world
           File.open(@config[:filename], 'w') do |f|
             f.write @world.to_yaml
           end
+          load_world
         end
 
     end

data/lib/asteroid/script.rb

@@ -1,64 +1,10 @@
-require 'erb'
-
 module Asteroid
-  class Script
-
-    def initialize(filename)
-      @filename = filename
-    end
-
-    def set_data(data)
-      @data = data
-    end
-
-    def data
-      @data ||= {}
-    end
-
-    def name
-      File.basename @filename
-    end
-
-    def file_type
-      @file_type ||= @filename.split('.').last
-    end
 
-    def yml?
-      file_type == "yml"
-    end
-
-    def aster?
-      file_type == "aster"
-    end
+  class ScriptReference < FileReference
 
-    def template?
-      @filename.split('.').last == "erb"
+    def executable?
+      [:yml, :aster].include?(type)
     end
 
-    def render(locals = {})
-      script = File.read @filename
-      if template?
-        Template.new(:erb).render(
-          script,
-          self.data.merge(locals)
-        )
-      else
-        script
-      end
-    end
-
-    def self.named(name)
-      all.select{|s| s.name == name}.first
-    end
-
-    def self.all
-      files = Dir[Asteroid::Config.script_dir + "/*"]
-      files.map do |filename|
-        new(filename)
-      end
-    end
-
-
-
   end
 end