asteroid 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5c5cc037af98984058dd5b4f265e016566f8f3f
-  data.tar.gz: f63bd8fd4eb00c4ae7fc2b081c6c132ff8910040
+  metadata.gz: 01b1a83d9142f123465b81172dfb371e78c056b1
+  data.tar.gz: 904a539da5bfb209e53b2bf9a5ec26f4051433f7
 SHA512:
-  metadata.gz: 5b3a7534a6668e92a89ac8c605502017e5bbafe4fa930a856bfc5e6c037bae2eedcd7fe83bbc4c92482bdfd83df1ffb9aa536d656f76b55dbe7912e1d0d3d27d
-  data.tar.gz: 3d79c608d88e060845516c5424bd1374d04769014acec7961a701ca64de60274c8ce061cb0d6e080776c29f0476556e1710d879345ed680ce90801fcf19a0d20
+  metadata.gz: 58f537411b43f906345f495b7eea178e45ede7ed4f84b0d9c49025e3d110ee44a919cc83fae441abbf0ec82dc6580fee97af3b1f60d4a29e7dd126a8e5d02352
+  data.tar.gz: 380772b7ea54f831fe0fc40b9c7477412d514ae9fcb1e5d3bb16c5b8bbd1b680db571eefa1a98cdee2aec43347f6efc7186ceda464e8243fbd9dac2c03915bb8

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-# gem "aster", path: "/Users/sam/Documents/Projects/aster"
+gem "aster", path: "/Users/sam/Documents/Projects/aster"
 # Specify your gem's dependencies in asteroid.gemspec
 gemspec

data/README.md

@@ -33,7 +33,7 @@ commands:
     - configure
     
   configure:
-    - run apt-get upgrade
+    - exec apt-get upgrade
 
 ```
 
@@ -48,3 +48,46 @@ asteroid server create web
 If everything is configured you should have a new server in the cloud.
 
 
+## Environments
+
+Environments are like Rails environments. They allow you to define different settings for your server files depending on what "environment" you are using. The default environment is development.
+
+```yaml
+name: web
+
+environments:
+  
+  development:
+    provider:
+      virtual_box:
+
+    # we may want to use VirtualBox locally to 
+    # test our setup scripts
+  
+  production:
+    provider:
+      digital_ocean:
+        size_id: 61               # DigitalOcean 1gb
+
+
+
+```
+
+
+## Namespaces
+
+Namespaces are a way of using one DigitalOcean account to support multiple Asteroid projects. For instance, having a namespace of `client-1` would allow you use an Asteroid project for that client and not conflict with your other servers.
+
+`config/asteroid.rb` should looks like this if you want to use a namespace:
+
+```ruby
+
+Asteroid::Config.configure(Asteroid.root) do |c|
+  # This line configures a namespace for your servers
+  c.namespace = "my-app"
+end
+
+```
+
+
+

data/bin/asteroid

@@ -3,16 +3,18 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib/')
 
 require 'asteroid'
-require 'asteroid/application'
+
 
 boot_file = File.expand_path('./config/asteroid.rb')
 if File.exists?(boot_file)
   require boot_file
-  
+  require 'asteroid/application'
+
   # Existing Application
   Asteroid::Application::CLI.start ARGV
 
 else
+  require 'asteroid/application'
   # new application
   Asteroid::NewApplication.start ARGV
 

data/generator/config/asteroid.rb

@@ -4,6 +4,6 @@ Asteroid.root = File.expand_path(File.join(File.dirname(__FILE__), '../'))
 
 Asteroid::Config.configure(Asteroid.root) do |c|
 
-  
+  c.namespace = "<%= name %>";
 
 end

data/generator/secrets/config/providers.rb

@@ -2,6 +2,6 @@
 
 
 Asteroid::Config.providers << Asteroid::Provider::DigitalOcean.new(
-  client_id: Asteroid::Config.secrets[:digitalocean_client_id],
-  api_key: Asteroid::Config.secrets[:digitalocean_api_key]
+  client_id: Asteroid::Config.secret[:digitalocean_client_id],
+  api_key: Asteroid::Config.secret[:digitalocean_api_key]
 )

data/lib/asteroid/config.rb

@@ -1,5 +1,12 @@
 module Asteroid
 
+  def self.environment=(env)
+    @environment = env.to_sym
+  end
+
+  def self.environment
+    @environment ||= ENV["ASTEROID_ENV"] || :development
+  end
 
   def self.root=(root)
     @root = root
@@ -55,6 +62,7 @@ module Asteroid
         @template_engines ||= {}
       end
 
+      attr_accessor :namespace
       attr_accessor :asteroid_dir
       attr_accessor :script_dir
       attr_accessor :file_dir

data/lib/asteroid/generator.rb

@@ -35,7 +35,9 @@ module Asteroid
       cp    g('/asteroid/servers/default.yml'), c[:server_dir]
 
       mkdir c[:config_dir]
-      cp    g('/config/asteroid.rb'), c[:config_dir]
+      cp_erb    g('/config/asteroid.rb'), c[:config_dir], {
+        name: File.basename(@project_root)
+      }
 
       mkdir c[:secret_dir]
       touch File.join(c[:secret_dir], '.keep')
@@ -65,6 +67,22 @@ module Asteroid
       end      
     end
 
+    def cp_erb(from, to, data)
+      if File.directory?(to)
+        to = File.join(to, File.basename(from))
+      end
+      if File.exists?(to)
+        puts "exists\t#{to}"
+      else
+        puts "add\t#{to}"
+        template_string = File.read from
+        template = Template.new(:erb, template_string)        
+        File.open(to, 'w') do |f|
+          f.write template.render data
+        end
+      end
+    end
+
     def cp(from, to)
       if File.directory?(to)
         to = File.join(to, File.basename(from))

data/lib/asteroid/instance.rb

@@ -27,7 +27,8 @@ module Asteroid
                 :type,
                 :id,
                 :name,
-                :ip_address
+                :ip_address,
+                :namespace
 
 
     def initialize(options = {})
@@ -41,6 +42,10 @@ module Asteroid
       @name = options.delete :name
       @ip_address = options.delete :ip_address
 
+      if @name =~ /:/
+        @namespace, @name = @name.split(':', 2)
+      end
+
       if @name && @type.nil?
         @type = name.split('-').first.to_sym
       end
@@ -70,9 +75,17 @@ module Asteroid
 
     def self.all
       instances = Provider.all.instances
-      instances.map do |info|
+      instances = instances.map do |info|
         new info
       end
+
+      if Config.namespace
+        instances = instances.delete_if do |i|
+          i.namespace != Config.namespace
+        end
+      end
+
+      instances
     end
 
     def self.first(type)

data/lib/asteroid/key_reference.rb

@@ -9,6 +9,10 @@ module Asteroid
       end
     end
 
+    def name
+      @name
+    end
+
     def initialize(name)
       @name = name
 

data/lib/asteroid/provider/abstract.rb

@@ -9,6 +9,9 @@
 # :status=>"active",
 # :created_at=>"2014-04-12T20:44:53Z"}
 
+require 'active_support/concern'
+
+
 module Asteroid
   module Provider
     class Abstract

data/lib/asteroid/provider/digital_ocean.rb

@@ -1,5 +1,7 @@
+
 module Asteroid
   module Provider
+
     class DigitalOcean < Abstract
 
       def initialize(config = {})

data/lib/asteroid/server.rb

@@ -37,6 +37,12 @@ module Asteroid
       data = self.class.default_config
       data.deep_merge! options
 
+      # Merge environment data
+      if env = data.delete(:environments)
+        env = env[Asteroid.environment] || {}
+        data.deep_merge! env
+      end
+
       @name = data.delete(:name)
 
       @provider = if data[:provider]
@@ -104,7 +110,8 @@ module Asteroid
     end
 
     def generate_instance_name
-      "#{self.name}-#{SecureRandom.hex(4)}"
+      namespace = Config.namespace ? "#{Config.namespace}:" : ""
+      "#{namespace}#{self.name}-#{SecureRandom.hex(4)}"
     end
 
     def create_instance!

data/lib/asteroid/version.rb

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

data/test/helper.rb

@@ -13,8 +13,10 @@ class TestCase < Minitest::Test
   include Asteroid
 
   def setup
+    Asteroid.environment = :development
     Asteroid::Provider::Mock.clear!
     Asteroid::Config.providers = [Asteroid::Provider::Mock.new]
+    Asteroid::Config.namespace = nil
   end
   
   def assert_not_nil o

data/test/unit/test_config.rb

@@ -0,0 +1,14 @@
+require_relative '../helper'
+
+class TestConfig < TestCase
+
+  def test_default_environment
+    assert_equal Asteroid.environment, :development
+  end
+
+  def test_default_namespace
+    n = Asteroid::Config.namespace
+    assert_equal nil, n
+  end
+
+end

data/test/unit/test_instance.rb

@@ -30,5 +30,11 @@ class TestInstance < TestCase
     assert_equal "1234", i["ssh.port"]
   end
 
+  def test_instance_namespace
+    i = Instance.new name: "name:web-23423423"
+    assert_equal :web, i.server.type
+    assert_equal "name", i.namespace
+  end
+
 
 end

data/test/unit/test_server.rb

@@ -22,6 +22,24 @@ class TestServer < TestCase
     assert_respond_to(server.ssh_key, :public)
   end
 
+  def test_server_env_options
+    env = {
+      development: {
+        ssh_key: 'dev'
+      },
+      production: {
+        ssh_key: 'prod'
+      }
+    }
+    server = Server.new environments: env
+    assert_equal server.ssh_key.name, 'dev'
+
+    Asteroid.environment = :production
+
+    server = Server.new environments: env
+    assert_equal server.ssh_key.name, 'prod'
+  end
+
   def test_instance_options
     config = {
       "whatever" => 123,
@@ -48,6 +66,21 @@ class TestServer < TestCase
     assert_equal "4", instance.eval_command("add-two 2")
   end
 
+  def test_generate_name
+    s = Server.new name: "hyperlinks"
+    
+    Asteroid::Config.namespace = nil
+    name = s.generate_instance_name
+    assert_equal "hyperlinks", name.split('-').first
+
+    Asteroid::Config.namespace = "wowcool"
+    name = s.generate_instance_name
+    assert_equal "wowcool:hyperlinks", name.split('-').first
+
+    i = s.create_instance!
+    assert_equal "wowcool", i.namespace
+  end
+
   def test_server_type
     s = Server.new name: "web"
     assert_equal :web, s.type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asteroid
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sam Murphy
@@ -209,6 +209,7 @@ files:
 - sample/config/asteroid.rb
 - test/helper.rb
 - test/unit/test_application.rb
+- test/unit/test_config.rb
 - test/unit/test_file_reference.rb
 - test/unit/test_instance.rb
 - test/unit/test_script_reference.rb
@@ -241,6 +242,7 @@ summary: A server configuration framework
 test_files:
 - test/helper.rb
 - test/unit/test_application.rb
+- test/unit/test_config.rb
 - test/unit/test_file_reference.rb
 - test/unit/test_instance.rb
 - test/unit/test_script_reference.rb