asteroid 0.0.1 → 0.0.2

data/lib/asteroid/server.rb

@@ -5,25 +5,51 @@ require "active_support/core_ext/hash"
 module Asteroid
   class Server
 
-    attr_accessor :scripts, 
-                  :configure_steps
+    attr_accessor :name,
+                  :scripts, 
+                  :configure_steps,
+                  :instance_options,
+                  :ssh_key
+
+    def self.all
+      Dir[Asteroid::Config.server_dir + '/**/*.yml'].delete_if do |g|
+        File.basename(g) == "default.yml"
+      end.map do |g|
+        load g
+      end
+    end
+
+    def self.default_config
+      data = YAML.load_file File.join(Asteroid::Config.server_dir, '/default.yml') || {}
+      ActiveSupport::HashWithIndifferentAccess.new data
+    end
 
     def self.named(name)
-      data = YAML::load_file(Asteroid::Config.server_dir + "/#{name}.yml")
+      load Asteroid::Config.server_dir + "/#{name}.yml"
+    end
+
+    def self.load(filename)
+      data = YAML.load_file filename
       new data
     end
 
-    def initialize(data = {})
-      data = ActiveSupport::HashWithIndifferentAccess.new(data)
-      
+    def initialize(options = {})
+      data = self.class.default_config
+      data.deep_merge! options
+
+      @name = data.delete(:name)
+
       @provider = if data[:provider]
         Provider.named data[:provider]
       else
         Config.providers.first
       end
-
       
-      @attributes = data
+      @instance_options = data.delete :instance_options || {}
+
+      @commands = data.delete(:commands) || {}
+
+      @ssh_key = KeyReference.new data.delete(:ssh_key)
 
       @config = data["config"] || {
         "admin_username" => "ubuntu",
@@ -34,15 +60,11 @@ module Asteroid
         "login.username" => "root", 
         "ssh.port" => "22"
       }
-    end
 
-
-    def name
-      @attributes[:name]
     end
 
-    def attributes
-      @attributes
+    def name
+      @name && @name.to_sym
     end
 
     def commands
@@ -70,25 +92,22 @@ module Asteroid
     end
 
     def ssh_key_filename
-      File.join Asteroid::Config.ssh_key_dir, @ssh_keys.first
+      if @ssh_key
+        File.join Asteroid::Config.secret_key_dir, @ssh_key
+      else
+        nil
+      end
     end
 
     def provider
       @provider
     end
 
-    def generate_instance_name(subname = nil)
-      "#{self.name}-#{subname || SecureRandom.hex(4)}"
+    def generate_instance_name
+      "#{self.name}-#{SecureRandom.hex(4)}"
     end
 
-    def create_instance!(subname = nil)
-  
-      #key_ids = SSHKey.all.select do |k|
-      #  @ssh_keys.include?(k.name)
-      #end.map do |k|
-      #  k.id
-      #end
-
+    def create_instance!
       provider.create_instance(self)
     end
 

data/lib/asteroid/template.rb

@@ -1,15 +1,25 @@
+require 'erb'
+
 module Asteroid
   class Template
 
-    def initialize(type = :erb)
+    attr_accessor :text
+
+    def initialize(type = :erb, text = nil)
       @type = type
+      @text = text
+    end
+
+    def render(locals = {})
+      render_text(@text, locals)
     end
 
-    def render(text, locals = {})
-      if @type == :erb
-        render_erb(text, locals)
+    def render_text(text = nil, locals = {})
+      m = "render_#{@type}"
+      if Asteroid::Config.template_engines[@type]
+        self.send m, text, locals
       else
-        raise "Unknown teplate: #{@type}"
+        raise "No template engine for type #{@type}"
       end
     end
 
@@ -20,6 +30,8 @@ module Asteroid
           data = OpenStruct.new(locals).instance_eval{ binding }
         )
       end
-
+      
   end
-end
+end
+
+Asteroid::Config.template_engines[:erb] = Asteroid::Template

data/lib/asteroid/version.rb

@@ -1,3 +1,3 @@
 module Asteroid
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/sample/.gitignore

@@ -0,0 +1,2 @@
+/.bundle
+/secrets

data/sample/README.md

@@ -0,0 +1 @@
+# Change me

data/sample/TODO

@@ -0,0 +1,9 @@
+# TODO
+
+* run configure on create
+
+* Get working
+
+* Inject provider-specific commands like DO's upload SSH Keys
+
+* Prevent multiple same provider types?

data/sample/asteroid/files/nginx/nginx.conf

@@ -0,0 +1 @@
+

data/sample/asteroid/scripts/ubuntu.aster

@@ -0,0 +1,4 @@
+
+
+apt-get update -y
+apt-get upgrade -y

data/sample/asteroid/servers/default.yml

@@ -0,0 +1,3 @@
+#####################################
+# Defaults that apply to all servers
+# 

data/sample/asteroid/servers/web.yml

@@ -0,0 +1,5 @@
+
+name: web
+
+configure:
+  - run ubuntu.aster

data/sample/config/asteroid.rb

@@ -0,0 +1,9 @@
+
+
+Asteroid.root = File.expand_path(File.join(File.dirname(__FILE__), '../'))
+
+Asteroid::Config.configure(Asteroid.root) do |c|
+
+  
+
+end

data/test/helper.rb

@@ -1,8 +1,24 @@
 require File.join(File.dirname(__FILE__), *%w(.. lib asteroid))
 
-require "minitest/autorun"
+require 'minitest/autorun'
 
+Asteroid.root = File.join(File.dirname(__FILE__), '../sample')
+Asteroid::Config.configure Asteroid.root
 
-Asteroid::Config.providers << Asteroid::Provider::Mock.new
 
+#Asteroid::Config.providers << Asteroid::Provider::Mock.new
 
+
+class TestCase < Minitest::Test
+  include Asteroid
+
+  def setup
+    Asteroid::Provider::Mock.clear!
+    Asteroid::Config.providers = [Asteroid::Provider::Mock.new]
+  end
+  
+  def assert_not_nil o
+    assert_equal false, o.nil?
+  end
+
+end

data/test/unit/test_application.rb

@@ -0,0 +1,17 @@
+require_relative '../helper'
+
+require 'asteroid/application'
+
+class TestApplication < TestCase
+
+  def test_server_list
+    s = Application::Server.start %w(list)
+  end
+
+  def test_server_create
+    count = Asteroid::Instance.all.count
+    s = Application::Server.start %w(create web)
+    assert_equal(count + 1, Asteroid::Instance.all.count)
+  end
+
+end

data/test/unit/test_file_reference.rb

@@ -0,0 +1,18 @@
+require_relative '../helper'
+
+class TestFileReference < TestCase
+
+  def test_init
+    s = FileReference.new "nginx/nginx.conf"
+    assert_equal(true, s.exists?)
+    assert_equal(false, s.template?)
+  end
+
+  def test_template
+    s = FileReference.new "nginx/available_site.conf"
+    assert_equal(true, s.exists?)
+    assert_equal(true, s.template?)
+    assert_equal(:erb, s.type)
+  end
+
+end

data/test/unit/test_instance.rb

@@ -1,18 +1,34 @@
 require_relative '../helper'
 
-class TestInstance < Minitest::Test
-  include Asteroid
+class TestInstance < TestCase
 
   def test_get_all_instances
     instances = Instance.all
     assert_kind_of(Array, instances)
   end
 
-  def initialize_instance
-    instance = Instance.new
+  def test_infer_type_from_name
+    i = Instance.new name: "web-thing"
+    assert_equal :web, i.type
   end
 
+  def test_aster_environment
+    instance = Instance.new type: :web
+    e = instance.aster_environment
+    assert_equal("2", e.eval("add 1 1"))
+    e.eval "upload nginx/nginx.conf ~/nginx.test"
+    assert_equal ["~/nginx.test"], instance.mock_file_system.keys
+  end
+
+  def test_default_config
+    hex = SecureRandom.hex
+    i = Instance.new type: :web, id: hex
+    assert_equal "22", i["ssh.port"]
+    i["ssh.port"] = "1234"
 
+    i = Instance.new type: :web, id: hex
+    assert_equal "1234", i["ssh.port"]
+  end
 
 
 end

data/test/unit/test_script_reference.rb

@@ -0,0 +1,9 @@
+require_relative '../helper'
+
+class TestScriptReference < TestCase
+
+  def test_init
+    s = ScriptReference.new "ubuntu.aster"
+  end
+
+end

data/test/unit/test_server.rb

@@ -1,7 +1,6 @@
 require_relative '../helper'
 
-class TestServer < Minitest::Test
-  include Asteroid
+class TestServer < TestCase
 
   def test_create_instance_server
     s = Server.new name: "web"
@@ -10,10 +9,55 @@ class TestServer < Minitest::Test
     assert_equal(instance.server, s)
   end
 
+  def test_find_all
+    servers = Server.all
+    assert_equal 1, servers.count
+  end
+
+  def test_ssh_key
+    server = Server.new ssh_key: "web"
+    assert_not_nil(server.ssh_key)
+    assert_kind_of(KeyReference, server.ssh_key)
+    assert_respond_to(server.ssh_key, :private)
+    assert_respond_to(server.ssh_key, :public)
+  end
+
+  def test_instance_options
+    config = {
+      "whatever" => 123,
+      "something" => "else"
+    }
+    s = Server.new name: "web", instance_options: config
+    assert_equal config, s.instance_options
+  end
+
+  def test_commands
+    commands = {
+      "two" => ['add 1 1'],
+      "add-two" => {"args" => ['a'], "steps" => ['add $a 2']},
+      "something" => ['run something', 'do thing']
+    }
+    @s = Server.new name: "web", commands: commands
+    assert_equal commands, @s.commands
+  end
+
+  def test_command_instance
+    test_commands
+    instance = @s.create_instance!
+    assert_equal "2", instance.eval_command("two")
+    assert_equal "4", instance.eval_command("add-two 2")
+  end
+
   def test_server_type
     s = Server.new name: "web"
     assert_equal :web, s.type
   end
 
+  def test_create_server
+    cobol = Server.new name: "cobol"
+    instance = cobol.create_instance!
+    assert_equal(instance.server, cobol)
+    assert_equal(:cobol, instance.type)
+  end
 
 end

data/test/unit/test_template.rb

@@ -0,0 +1,16 @@
+require_relative '../helper'
+
+class TestTemplate < TestCase
+
+  def test_erb
+    t = Template.new(:erb)
+    t.text = "<%= 1 %>"
+    
+    assert_equal("1", t.render)
+  end
+
+  def initialize_instance
+    instance = Instance.new
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asteroid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sam Murphy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -150,20 +150,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - sam.murphy@gmail.com
@@ -173,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -190,7 +177,7 @@ files:
 - lib/asteroid.rb
 - lib/asteroid/application.rb
 - lib/asteroid/config.rb
-- lib/asteroid/config_file.rb
+- lib/asteroid/file_reference.rb
 - lib/asteroid/generator.rb
 - lib/asteroid/instance.rb
 - lib/asteroid/instance/aster.rb
@@ -198,6 +185,7 @@ files:
 - lib/asteroid/instance/scp.rb
 - lib/asteroid/instance/ssh.rb
 - lib/asteroid/instance/vars.rb
+- lib/asteroid/key_reference.rb
 - lib/asteroid/provider.rb
 - lib/asteroid/provider/abstract.rb
 - lib/asteroid/provider/digital_ocean.rb
@@ -207,10 +195,25 @@ files:
 - lib/asteroid/server.rb
 - lib/asteroid/ssh_key.rb
 - lib/asteroid/template.rb
+- lib/asteroid/template/liquid.rb
 - lib/asteroid/version.rb
+- sample/.gitignore
+- sample/README.md
+- sample/Rakefile
+- sample/TODO
+- sample/asteroid/files/nginx/available_site.conf.erb
+- sample/asteroid/files/nginx/nginx.conf
+- sample/asteroid/scripts/ubuntu.aster
+- sample/asteroid/servers/default.yml
+- sample/asteroid/servers/web.yml
+- sample/config/asteroid.rb
 - test/helper.rb
+- test/unit/test_application.rb
+- test/unit/test_file_reference.rb
 - test/unit/test_instance.rb
+- test/unit/test_script_reference.rb
 - test/unit/test_server.rb
+- test/unit/test_template.rb
 homepage: ''
 licenses:
 - MIT
@@ -237,5 +240,9 @@ specification_version: 4
 summary: A server configuration framework
 test_files:
 - test/helper.rb
+- test/unit/test_application.rb
+- test/unit/test_file_reference.rb
 - test/unit/test_instance.rb
+- test/unit/test_script_reference.rb
 - test/unit/test_server.rb
+- test/unit/test_template.rb