deus_ex 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e90453d65142296451cb08da20fe1d7ca0375cc
-  data.tar.gz: 71525b343f4570674a6c718dd27191cf4c130b19
+  metadata.gz: cb5caff6d219417b552cc49fd248b2c37469c02d
+  data.tar.gz: 76d50c97a3f9ef992c4ef81fca3c63aff2cd7064
 SHA512:
-  metadata.gz: 258effc6cfdcf61c63d09d0e549e6f00df30d8d4e91e3e8910b131c5cfc810fc63a60bf38a9110c2d77e3c4579bd88af9df8877266ca13c76bf46a8fe5f883dd
-  data.tar.gz: 56c40f0def41dc501d6ec593e017741a0cc0ccd3d77c1a5b9dfb68461616626469ff604b8d29943f7f135468f81fb454d62211c2edd023533641fb4a60fdd473
+  metadata.gz: 759476904690e49ca6d257d7c0c62389ebbd78be54fa8811ef7f2f8b8d9e980c9dc6328f37357eb1c4b3bfceca33b8c4f7ad2764717b52f1dcc489d505e477d6
+  data.tar.gz: 9f9ecc54ab7b1ee9a9b893f2874f9229eabb131fcf4463755cc4c2ba161e3314753a12e3bb4a0e024533f99b17ef8ac6dccdb043502fdeee201d544a6b6827eb

data/README.md

@@ -1,7 +1,7 @@
 # DeusEx
 
 GitHub DDOSings getting you down and stopping your deploys? GIT IS DISTRIBUTED, SUCKA. The deus_ex gem allows you to easily
-fire up an AWS instance, push your repo to it, and use that for your deploy until GitHub is back on its feet.
+fire up cloud instance, push your repo to it, and use that for your deploy until GitHub is back on its feet.
 
 ## Installation
 
@@ -17,13 +17,41 @@ Or install it yourself as:
 
     $ gem install deus_ex
 
-The gem uses [fog](http://fog.io/) to manage the connection to AWS, so you'll need to put your AWS credentials into `~/.fog`, like so:
+The gem uses [fog](http://fog.io/) to manage the connection to various cloud providers, so you'll need to put your credentials into `.machina.yml`, like so:
+
+    ---
+    :authentication:
+      :provider: 'aws'
+      :aws_access_key_id: my_access_key
+      :aws_secret_access_key: my_secret_access_key
+    :server_create:
+      :flavor_ref: 't1.micro'
+      :image_ref: 'ami-a9184ac0'
+      :key_name: 'bover'
+    :username: ubuntu
+    :private_key_path: /home/terry/.ssh/bover.pem
+
+Here is an OpenStack example to get a better idea of all the options available:
+
+    ---
+    :authentication:
+      :provider: 'openstack'
+      :openstack_username: '***********'
+      :openstack_api_key: '*************'
+      :openstack_auth_url: 'https://cloud.example.com:35357/v2.0/tokens'
+      :openstack_tenant: 'tenant_name'
+      :openstack_region: 'region-b.geo-1'
+    :server_create:
+      :flavor_ref: '103'
+      :image_ref: '8c096c29-a666-4b82-99c4-c77dc70cfb40'
+      :key_name: 'bover'
+      :nics: [ 'net_id': '76abe0b1-581a-4698-b200-a2e890f4eb8d' ]
+    :floating_ip_create:
+      :floating_network_id: '7da74520-9d5e-427b-a508-213c84e69616'
+    :public_key_path: /home/terry/.ssh/bover.pub
+    :private_key_path: /home/terry/.ssh/bover.pem
+    :username: ubuntu
 
-    default:
-      aws_access_key_id: my_access_key
-      aws_secret_access_key: my_secret_access_key
-      public_key_path: ~/.ssh/id_rsa.pub
-      private_key_path: ~/.ssh/id_rsa
 
 ## Usage
 
@@ -31,11 +59,18 @@ Once the gem's bundled, run the following to create your temporary instance:
 
     $ bundle exec deus_ex
 
-The gem will tell you what it's doing, and will give you the git URL for your new deploy-fromable repo. Use that for your deploy,
-then tear down your instance with
+The gem will tell you what it's doing, and will give you the git URL for your new deploy-fromable repo. Use that for your deploy, then tear down your instance with
 
     $ bundle exec deus_ex cleanup
 
+You can check to see if you have any active deus_ex instances running, as well:
+
+    $ bundle exec deus_ex status
+
+## Warning!
+
+This may not work if your app has dependencies on GitHub beyond the deployment repository -- if you're using git URLs for gems, for instance.
+
 ## Contributing
 
 1. Fork it

data/TODO.md

@@ -1,5 +1,4 @@
 ### GENERAL
-* Detect missing credentials
 * Specify SSH identity to use in the git push
 
 ### CAPISTRANO

data/bin/deus_ex

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'deus_ex'))
 
-if ARGV.length > 0 && ARGV[0] == 'cleanup'
-  DeusEx.cleanup
+if ARGV.length > 0
+  DeusEx.send(ARGV[0].to_s)
 else
   DeusEx.setup
 end

data/deus_ex.gemspec

@@ -6,10 +6,10 @@ require 'deus_ex/version'
 Gem::Specification.new do |spec|
   spec.name          = "deus_ex"
   spec.version       = DeusEx::VERSION
-  spec.authors       = ["Ben Scofield"]
+  spec.authors       = ["Ben Scofield", "Terry Howe"]
   spec.email         = ["bscofield@gmail.com"]
-  spec.description   = %q{Easily manage just-in-time EC2 git repos}
-  spec.summary       = %q{Easily manage just-in-time EC2 git repos}
+  spec.description   = %q{Easily manage just-in-time git repos}
+  spec.summary       = %q{Easily manage just-in-time git repos}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/deus_ex.rb

@@ -1,13 +1,17 @@
 require 'bundler/setup'
 require 'fog'
-require File.join(File.dirname(__FILE__), 'deus_ex', 'aws')
+require File.join(File.dirname(__FILE__), 'deus_ex', 'machina')
 
 module DeusEx
   def self.setup
-    DeusEx::AWS.setup
+    DeusEx::Machina.setup
   end
-  
+
   def self.cleanup
-    DeusEx::AWS.cleanup
+    DeusEx::Machina.cleanup
+  end
+
+  def self.status
+    DeusEx::Machina.status
   end
 end

data/lib/deus_ex/machina.rb

@@ -0,0 +1,171 @@
+require 'logger'
+require 'yaml'
+
+module DeusEx
+  class Machina
+    NAME            = 'deus_ex'
+    DEPLOY_PROJECT  = 'deus_ex_project'
+    GIT_REMOTE_NAME = 'deus-ex'
+
+    def self.setup
+      machina = new
+      machina.config_read
+      machina.setup_server
+      machina.setup_repository
+      machina.setup_git_remote
+    rescue Exception => e
+      if e.is_a?(SystemExit)
+        machina.log "Exiting"
+      else
+        machina.log "error: #{e.inspect}"
+        machina.clean_up
+        raise e
+      end
+    end
+
+    def self.cleanup
+      machina = new
+      machina.config_read
+      machina.clean_up
+    rescue Exception => e
+      if e.is_a?(SystemExit)
+        machina.log "Exiting"
+      else
+        machina.log "error: #{e.inspect}"
+        machina.clean_up
+        raise e
+      end
+    end
+
+    def self.status
+      machina = new
+      machina.config_read
+      machina.status
+    rescue Exception => e
+      if e.is_a?(SystemExit)
+        machina.log "Exiting"
+      else
+        machina.log "error: #{e.inspect}"
+        machina.clean_up
+        raise e
+      end
+    end
+
+    def compute
+      connection = ::Fog::Compute.new(@config[:authentication].dup)
+      log "connection established"
+      connection
+    end
+
+    def network
+      authentication = @config[:authentication].dup
+      authentication.delete(:version)
+      ::Fog::Network.new(authentication)
+    end
+
+    def config_read
+      @config = YAML.load_file('.machina.yml') if @config.nil?
+    end
+
+    def setup_server
+      log "creating server (this may take a couple of minutes)"
+      server_config = @config[:server_create].dup
+      server_config[:name] = NAME
+      @server = compute.servers.create(server_config)
+      log "server created"
+      @server.wait_for { print '.'; ready? }
+      log "server ready"
+      if @config[:floating_ip_create].nil?
+        @ip = @server.public_ip_address
+      else
+        create_floating_ip
+      end
+      log "server ip " + @ip
+    end
+
+    def create_floating_ip
+      floater = network.floating_ips.create(@config[:floating_ip_create])
+      floating_id = floater.id
+      @ip = floater.floating_ip_address
+      @port = 22
+      port = network.ports(:filters => { :device_id => @server.id }).first
+      network.associate_floating_ip(floating_id, port.id)
+    end
+
+    def test_ssh
+      socket = TCPSocket.new(@ip, @port)
+      IO.select([socket], nil, nil, 5)
+    rescue SocketError, Errno::ECONNREFUSED,
+      Errno::EHOSTUNREACH, Errno::ENETUNREACH, IOError
+      sleep 2
+      false
+    rescue Errno::EPERM, Errno::ETIMEDOUT
+      false
+    ensure
+      socket && socket.close
+    end
+
+    def setup_repository
+      log "initializing git repo"
+      @server.private_key_path = @config[:private_key_path]
+      ssh_options = {
+        :port => @port,
+        :key_data => [File.read(@config[:private_key_path])],
+        :auth_methods => ["publickey"]
+      }
+      log "." until test_ssh
+      Fog::SSH.new(@ip, @config[:username], ssh_options).run([
+        "mkdir #{DEPLOY_PROJECT}.git",
+        "cd #{DEPLOY_PROJECT}.git && git init --bare"
+      ])
+      log "git repo initialized"
+    end
+
+    def setup_git_remote
+      if system('git rev-parse')
+        log "adding local git remote"
+        system "git remote add #{GIT_REMOTE_NAME} #{git_remote}"
+
+        log "pushing to remote"
+        system "ssh-agent bash -c 'ssh-add #{@config[:private_key_path]}; git push #{GIT_REMOTE_NAME} master'"
+
+        log "removing local git remote"
+        system "git remote rm #{GIT_REMOTE_NAME}"
+
+        log ""
+        log "you can now deploy from #{git_remote}"
+      else
+        warn "not in a git repo"
+      end
+    end
+
+    def clean_up
+      destroyed = servers.map(&:destroy).count
+      log "#{destroyed} server#{'s' if destroyed != 1} destroyed"
+    end
+
+    def status
+      log "#{servers.count} server#{'s' if servers.count != 1} found"
+    end
+
+    def servers
+      @server ? [@server] : compute.servers.select { |s| s.name == NAME }
+    end
+
+    def git_remote
+      "#{@config[:username]}@#{@server.public_ip_address}:#{DEPLOY_PROJECT}.git"
+    end
+
+    def log(message, level = :info, logger = Logger.new($stdout))
+      logger.formatter = proc do |severity, datetime, progname, msg|
+        "[DEUS EX] #{msg}\n"
+      end
+
+      logger.send(level, message)
+    end
+
+    def warn(message)
+      log message, :warn
+    end
+  end
+end

data/lib/deus_ex/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: deus_ex
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Scofield
+- Terry Howe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +67,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily manage just-in-time EC2 git repos
+description: Easily manage just-in-time git repos
 email:
 - bscofield@gmail.com
 executables:
@@ -83,7 +84,7 @@ files:
 - bin/deus_ex
 - deus_ex.gemspec
 - lib/deus_ex.rb
-- lib/deus_ex/aws.rb
+- lib/deus_ex/machina.rb
 - lib/deus_ex/version.rb
 homepage: ''
 licenses:
@@ -105,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
-summary: Easily manage just-in-time EC2 git repos
+summary: Easily manage just-in-time git repos
 test_files: []

data/lib/deus_ex/aws.rb

@@ -1,97 +0,0 @@
-require 'logger'
-
-module DeusEx
-  class AWS
-    IMAGE_ID        = 'ami-3679e75f'
-    DEPLOY_PROJECT  = 'deus_ex_project'
-    REMOTE_USER     = 'ubuntu'
-    GIT_REMOTE_NAME = 'deus-ex'
-
-    def self.setup
-      aws = new
-      aws.setup_connection
-      aws.setup_server
-      aws.setup_repository
-      aws.setup_git_remote
-    rescue Exception => e
-      aws.log "error: #{e.inspect}"
-      aws.clean_up
-      raise e
-    end
-
-    def self.cleanup
-      aws = new
-      aws.setup_connection
-      aws.clean_up
-    end
-
-    def setup_connection
-      @connection = Fog::Compute.new({
-        :provider => 'AWS'
-      })
-      log "connection established"
-    end
-
-    def setup_server
-      log "creating server (this may take a couple of minutes)"
-      @server = @connection.servers.bootstrap({
-        :image_id  => IMAGE_ID,
-        :username  => REMOTE_USER
-      })
-      log "server created"
-    end
-
-    def setup_repository
-      log "initializing git repo"
-      @server.ssh([
-        "mkdir #{DEPLOY_PROJECT}.git",
-        "cd #{DEPLOY_PROJECT}.git && git init --bare"
-      ])
-
-      log "git repo initialized"
-    end
-
-    def setup_git_remote
-      if system('git rev-parse')
-        log "adding local git remote"
-        system "git remote add #{GIT_REMOTE_NAME} #{git_remote}"
-
-        log "pushing to remote"
-        system "git push #{GIT_REMOTE_NAME} master"
-
-        log "removing local git remote"
-        system "git remote rm #{GIT_REMOTE_NAME}"
-
-        log ""
-        log "you can now deploy from #{git_remote}"
-      else
-        warn "not in a git repo"
-      end
-    end
-
-    def clean_up
-      if @server
-        @server.destroy
-      else
-        @connection.servers.select {|s| s.image_id == IMAGE_ID}.map(&:destroy)
-      end
-      log "server destroyed"
-    end
-
-    def git_remote
-      "#{REMOTE_USER}@#{@server.dns_name}:#{DEPLOY_PROJECT}.git"
-    end
-
-    def log(message, level = :info, logger = Logger.new($stdout))
-      logger.formatter = proc do |severity, datetime, progname, msg|
-        "[DEUS EX] #{msg}\n"
-      end
-
-      logger.send(level, message)
-    end
-
-    def warn(message)
-      log message, :warn
-    end
-  end
-end