simple_provision 0.99.5 → 0.99.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b94eb29ab3fa531033b62ec0f7b9f957c54122
-  data.tar.gz: 716bd8499c0435e8055c432b1561cbd17733d8da
+  metadata.gz: c1ff2a55eb683cc8e6f25b12c8565bd62c93bc99
+  data.tar.gz: 2ac7128c70fde4cac971896fab7132a46e9446f5
 SHA512:
-  metadata.gz: 42580941b0da8fa9e8c977a8a3f6326153c32aa9f3090b51f9bedbcd18d5683e060c2b9f5397674a281f0e54da6198c7ab9b8eae20cf22fc2f7a417e9ad9845a
-  data.tar.gz: c10a3d916d57b1d1f8b84401ffcbb2935e9bff921df3e57ec842a9187409789516af3b088fcd250a28c7e7dbb5402fe0358cddf8e77603d8c3fdce00d406ad66
+  metadata.gz: a6fb5a3e387013d6db44ab56e0ba6213f0d762d0ffbcd4dc72afacebe0e6232a3ef4cbf51a3503094af68fbe2a7a026a8959c1a4cb05819d8ee58943a859168a
+  data.tar.gz: 67d345ad0b1fe411acc5c14710025153dde7dc3e91ddc8b1474b00161e824aa42825a3cf4b1eddc0f14a4cafef59b2e6ca1c8d99a86d9996e2117513c2e2c48e

data/README.md

@@ -1,12 +1,10 @@
 # Introduction
 This is based on the work that brandonhilkert initally carried to automate
-EC2 instance provision with YAML and SHELL script. It tries to bring the good spirit: SIMPLE, and JUST WORK to the world of Digital Ocean.
+EC2 instance provision with YAML and SHELL script. It tries to bring the good spirit: SIMPLE, and JUST WORK to the world of every remote machine.
 
-If you own a Digital Ocean, here is my advice: Chef and Puppet is shitty
-thing that just create more problems than it solves. It will take you
-days even weeks just to get familar and put things in the right order.
-
-With simple_provision, you get your hand dirty in a few minutes and
+I had been banging my head trying to work with Chef and Puppet in the
+past, so this is my attempt to make the provision stuff easier to be
+implemented.  With this tool, you get your hand dirty in a few minutes and
 we have the working provision profile in just half an hour. From that
 moment, provision another instance is just the matter of kicking off
 a command from the terminal.
@@ -19,7 +17,7 @@ Let's rock.
 ### Recipes repo
 
 Don't forget to also checkout the recipes collection
-https://github.com/phuongnd08/simple_privision_recipes
+https://github.com/phuongnd08/simple_provision_recipes
 
 # How it works
 This gem carries the provision by uploading a set of scripts (and
@@ -64,7 +62,7 @@ It's up to you to use ERB, HAML or any kind of template processors.
 
 So: You put definition of each type of server in `servers/type.yml`.
 In `files` and `scripts` folder, you place files and scripts that will be
-uploaded to the Digital Ocean droplet and executed.
+uploaded to the server machine and executed there.
 
 ## Installation
 
@@ -114,8 +112,8 @@ Variables defined in `env` will be exposed to scripts during execution.
 That way you can use the same scripts for different type of server and
 still be able to produce different outcomes.
 
-## Provision your Digital Ocean server:
-`simpro y-awesome-server --droplet-name YOUR_DROPLET_NAME`
+## Provision your server
+`simpro my-awesome-server root@my-host`
 
 ## Contributing
 

data/bin/simpro

@@ -4,25 +4,13 @@ require 'optparse'
 require_relative '../lib/simple_provision'
 
 options = {}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: fss [options] type"
-
-  opts.on('--droplet-name NAME', 'An exiting Droplet Name' ) do |name|
-    options[:droplet_name] = name
-  end
-
-  opts.on('-h', '--help', 'Display this screen' ) do
-    puts opts
-    exit
-  end
-
-  opts.on('-v', '--version', 'Show version' ) do
-    puts SimpleProvision::Version
-  end
-end.parse!
-
-options.merge!(type: ARGV.first)
-
-cli = SimpleProvision::CLI.new(options)
+invalid_argument = false
+invalid_argument = true if ARGV.length != 2
+unless invalid_argument
+  username, host = ARGV.last.split('@')
+  invalid_argument = username.nil? || host.nil?
+end
+
+cli = SimpleProvision::CLI.new(profile: ARGV.first, username: username, host: host)
+cli.bootstrap
 cli.configure

data/lib/simple_provision.rb

@@ -1,4 +1,4 @@
-require "simple_provision/version"
+require_relative "simple_provision/version"
 
 begin
   require 'pry'
@@ -7,8 +7,4 @@ end
 
 require_relative 'simple_provision/cli'
 require_relative 'simple_provision/configuration'
-require_relative 'simple_provision/connection'
 require_relative 'simple_provision/scp'
-require_relative 'simple_provision/server'
-
-require_relative 'ext/fog'

data/lib/simple_provision/cli.rb

@@ -1,30 +1,48 @@
+require 'net/ssh'
+
 module SimpleProvision
   class CLI
-    def initialize(opts = {})
-      @opts = opts
-      @connection = SimpleProvision::Connection.new(options).connection
+    attr_reader :profile, :username, :host
+    def initialize(args)
+      @profile = args[:profile]
+      @username = args[:username]
+      @host = args[:host]
     end
 
     def bootstrap
-      server.bootstrap
-    end
-
-    def build
-      server.build
+      SimpleProvision::SCP.new(username, host, options).copy_files
     end
 
     def configure
-      server.configure
+      Net::SSH.start(host, username) do |ssh|
+        ssh.exec! "tar -xzf #{SimpleProvision::SCP::FILENAME}"
+        scripts = options.fetch(:scripts).each do |script|
+          puts "Execute #{script}"
+          ssh.exec!("#{environment_exports} bash -c '#{script}'") do |channel, stream, data|
+            print data
+          end
+        end
+      end
     end
 
     private
 
+    def environment_exports
+      @environment_exports ||= begin
+                                 if options[:env].nil?
+                                   ""
+                                 else
+                                   options[:env].map { |k, v| [k, Shellwords.escape(v)].join("=") }.join(" ")
+                                 end
+                               end
+    end
+
     def server
       SimpleProvision::Server.new(@connection, options)
     end
 
     def options
-      @options ||= SimpleProvision::Configuration.new(@opts).options
+      @options ||= SimpleProvision::Configuration.new(@profile).options
     end
   end
 end

data/lib/simple_provision/configuration.rb

@@ -6,13 +6,12 @@ module SimpleProvision
     MissingServerConfiguration = Class.new(StandardError)
 
     attr_reader :options
+    attr_reader :profile
 
-    def initialize(command_line_options = {})
-      @command_line_options = command_line_options
+    def initialize(profile)
+      @profile = profile
 
       read_and_parse_server_options
-
-      raise MissingServerType, "Please specify a type of server you want to create using the --type option" unless options[:type]
     end
 
     private
@@ -29,21 +28,17 @@ module SimpleProvision
       begin
         YAML.load(File.read(server_file))
       rescue Errno::ENOENT
-        raise MissingServerConfiguration, "Please create a configuration file './servers/#{type}.yml'"
+        raise MissingServerConfiguration, "Please create a configuration file './servers/#{profile}.yml'"
       end
     end
 
     def server_file
-      "servers/#{type}.yml"
+      "servers/#{profile}.yml"
     end
 
     def read_and_parse_server_options
-      options_string_hash = default_options.merge(server_options).merge(@command_line_options)
+      options_string_hash = default_options.merge(server_options)
       @options = Hash[options_string_hash.map{ |(k,v)| [k.to_sym, v] }]
     end
-
-    def type
-      @command_line_options[:type]
-    end
   end
 end

data/lib/simple_provision/scp.rb

@@ -1,15 +1,17 @@
+require 'net/scp'
+require 'byebug'
+
 module SimpleProvision
   class SCP
     FILENAME = "simpro.tar.gz"
 
-    def initialize(server, opts)
-      @server, @opts = server, opts
+    def initialize(username, host, opts)
+      @username, @host, @opts = username, host, opts
     end
 
-    def to_server
+    def copy_files
       create_local_archive
       scp_files_to_server
-      extract_remote_archive
       remove_local_archive
     end
 
@@ -38,11 +40,11 @@ module SimpleProvision
     end
 
     def scp_files_to_server
-      @server.scp("tmp/#{FILENAME}", ".")
-    end
-
-    def extract_remote_archive
-      @server.ssh("tar -xzf #{FILENAME}")
+      Net::SCP.start(@host, @username) do |scp|
+        scp.upload!("tmp/#{FILENAME}", ".")
+      end
+    rescue Net::SSH::HostKeyMismatch
+      puts "Please run ssh #{@username}@#{@host} to verify the fingerprint first"
     end
 
     def remove_local_archive

data/lib/simple_provision/version.rb

@@ -1,3 +1,3 @@
 module SimpleProvision
-  VERSION = "0.99.5"
+  VERSION = "0.99.6"
 end

data/simple_provision.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "fog", ">= 1.21.0"
+  spec.add_dependency "net-scp"
+  spec.add_dependency "net-ssh"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_provision
 version: !ruby/object:Gem::Version
-  version: 0.99.5
+  version: 0.99.6
 platform: ruby
 authors:
 - Phuong Gia Su
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,19 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The easiest, most common sense server provision tool.
 email:
 - phuongnd08@gmail.com
@@ -68,13 +82,10 @@ files:
 - README.md
 - Rakefile
 - bin/simpro
-- lib/ext/fog.rb
 - lib/simple_provision.rb
 - lib/simple_provision/cli.rb
 - lib/simple_provision/configuration.rb
-- lib/simple_provision/connection.rb
 - lib/simple_provision/scp.rb
-- lib/simple_provision/server.rb
 - lib/simple_provision/version.rb
 - simple_provision.gemspec
 homepage: https://github.com/phuongnd08/simple_provision

data/lib/ext/fog.rb

@@ -1,52 +0,0 @@
-require 'fog'
-require 'fog/core/ssh'
-
-# Monkey-patch Fog 1.3.1 to stream SSH output
-# (in real time) to stdout.
-class Fog::SSH::Real
-  def run(commands)
-    commands = [*commands]
-    results  = []
-    begin
-      Net::SSH.start(@address, @username, @options) do |ssh|
-        commands.each do |command|
-          result = Fog::SSH::Result.new(command)
-          ssh.open_channel do |ssh_channel|
-            ssh_channel.request_pty
-            ssh_channel.exec(command) do |channel, success|
-              unless success
-                raise "Could not execute command: #{command.inspect}"
-              end
-
-              channel.on_data do |ch, data|
-                result.stdout << data
-                puts data
-              end
-
-              channel.on_extended_data do |ch, type, data|
-                next unless type == 1
-                result.stderr << data
-                puts data
-              end
-
-              channel.on_request('exit-status') do |ch, data|
-                result.status = data.read_long
-              end
-
-              channel.on_request('exit-signal') do |ch, data|
-                result.status = 255
-              end
-            end
-          end
-          ssh.loop
-          results << result
-        end
-      end
-    rescue Net::SSH::HostKeyMismatch => exception
-      exception.remember_host!
-      sleep 0.2
-      retry
-    end
-    results
-  end
-end

data/lib/simple_provision/connection.rb

@@ -1,25 +0,0 @@
-require 'fog'
-
-module SimpleProvision
-  class Connection
-    MissingDigitalOceanCredentials = Class.new(StandardError)
-
-    def initialize(opts)
-      @opts = opts
-
-      if ENV["DIGITAL_OCEAN_API_KEY"].nil? || ENV["DIGITAL_OCEAN_CLIENT_ID"].nil?
-        raise SimpleProvision::Connection::MissingDigitalOceanCredentials, "Make sure DIGITAL_OCEAN_API_KEY and DIGITAL_OCEAN_CLIENT_ID are environmental variables with your credentials"
-      end
-    end
-
-    def connection
-      @connection ||= begin
-        Fog::Compute.new(
-          provider: "DigitalOcean",
-          digitalocean_client_id: ENV["DIGITAL_OCEAN_CLIENT_ID"],
-          digitalocean_api_key: ENV["DIGITAL_OCEAN_API_KEY"]
-        )
-      end
-    end
-  end
-end

data/lib/simple_provision/server.rb

@@ -1,55 +0,0 @@
-require 'shellwords'
-
-module SimpleProvision
-  class Server
-    ServerNotFound = Class.new(StandardError)
-    MissingDropletName = Class.new(StandardError)
-
-    attr_reader :server
-
-    def initialize(connection, options)
-      @connection, @options = connection, options
-    end
-
-    def configure
-      get(options[:droplet_name]) if server.nil?
-      raise ServerNotFound, "Unable to find server with Droplet name #{options[:droplet_name]}." if server.nil?
-
-      SimpleProvision::SCP.new(server, options).to_server
-      scripts = options.fetch(:scripts).map do |script|
-        "#{environment_exports} bash -c '#{script}'"
-      end
-      server.ssh(scripts)
-    end
-
-    def environment_exports
-      @environment_exports ||= begin
-                                 if options[:env].nil?
-                                   ""
-                                 else
-                                   options[:env].map { |k, v| [k, Shellwords.escape(v)].join("=") }.join(" ")
-                                 end
-                               end
-    end
-
-    private
-
-    attr_reader :options, :connection
-
-    def get(droplet_name)
-      if droplet_name.nil?
-        raise SimpleProvision::Server::MissingDropletName ,
-          "Please specify the Droplet Name using the --droplet-name option."
-      end
-      @server = connection.servers.detect { |server| server.name == droplet_name }
-      if options.has_key?(:private_key_path)
-        @server.private_key_path = options.fetch(:private_key_path)
-      end
-      @server
-    end
-
-    def name
-      "#{options.fetch(:name).downcase.sub(/ /, '-')}-#{Time.now.strftime("%y-%m-%d-%H-%M")}"
-    end
-  end
-end