simple_provision 0.99.8 → 0.99.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16cab0f7bac2b4541f524b7bc291ebaeab17f716
-  data.tar.gz: 5830849d9fe535a9b3e4ca73c0cf41a1195965bc
+  metadata.gz: ba3a4cf0d797ab20a94b1a4a64802527c1f53c40
+  data.tar.gz: 83dbd3ee11fae8d35af90f17cb69c51e6e5a547d
 SHA512:
-  metadata.gz: 398a965f8acaf2d6ae1acd5ed83e8dfeae4d5f0ca6b4f8c6206ea8f39ab995811e44bf687b78e0ebd3f5dbb4581aadfd8fa2eb8967547e9c33086e889a00b1bd
-  data.tar.gz: f8095de17806127930c141aaef5fe0f404410151e08acae0c1de71e3bcc2b8244032d31f7cae391171e235c6210688b2ae22df08f3d158c8721ff4e14107d669
+  metadata.gz: 52f1c14e75716dfcee3052212b0bab8722ac96610219def78d3d8a023b5ead46711a8b6e48397b34d6f96b2258e314e262ec5d1f72aec2a0e0adf005c2e04f88
+  data.tar.gz: a8526e1aad13fcde6ca0d567e30084f9d63325ad428ac63153fcf2566375d02f3e0c2759ce13d13d89ae85ba77e4fff022deff86512eddbe047034f0f8eb020d

data/README.md

@@ -2,15 +2,9 @@
 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 every remote machine.
 
-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.
-
-I use simple_provision with mina in my Rails projects and the combination
-has been working really well for me.
+I used to use this to do all the provision of Redis, Postgres, Nginx,
+Unicorn, Cron, etc before. These days I just use this to provision
+docker on the server and then use crane to orchestrate the rest.
 
 Let's rock.
 
@@ -20,8 +14,8 @@ Don't forget to also checkout the recipes collection
 https://github.com/phuongnd08/simple_provision_recipes
 
 # How it works
-This gem carries the provision by uploading a set of scripts (and
-files) to the server and execute there.
+This gem carries the provision by uploading a set of scripts and
+files to the server and execute there.
 
 It's up to you to choose the language you want. I often use a mix of
 SHELL and RUBY scripts to accomplish the task. SHELL for some simple stuff
@@ -33,13 +27,29 @@ and then you can start use ruby/python. The install of ruby and python can be
 as simple as create a bash contains "yum install ruby(python) -y" and include
 it in the top of the `scripts` section in your server definition file.
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'simple_provision'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install simple_provision
+
+
 # Project Structure
-As simple as it could: One or few servers definition written in YAML + setup scripts written in
-SHELL, RUBY and PYTHON + text files as resource.
-It's up to you to use ERB, HAML or any kind of template processors.
+The provision profile need to be defined inside /provision directory.
+Since it's just scripting, feel free to use ERB, HAML, or any kind of
+templates that you want, assume you install the necessary library before
+you do that.
 
 ```
-./provisions
+./provision
 ├── files
 │   ├── keys
 │   │   └── deploy_key
@@ -56,34 +66,16 @@ It's up to you to use ERB, HAML or any kind of template processors.
 │   ├── search_service_code.sh
 │   └── search_service_env.sh
 └── servers
-    ├── defaults.yml
+    ├── webapp.yml
+    ├── docker.yml
     └── search-service.yml
 ```
 
-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 server machine and executed there.
-
-## Installation
+In /provision/servers/{webapp, docker, search-service}.yml, you define
+your server defintion (read below).
 
-Add this line to your application's Gemfile:
-
-    gem 'simple_provision'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install simple_provision
-
-## Servers Configuration
-
-### Server Definition
-To define a server type, create a yaml file in the `./servers` directory with the following format:
-
-`./servers/my-awesome-server.yml`
+## Server Definition
+To define a server type, create a yaml file in the `./provision/servers` directory with the following format:
 
 ```yaml
 files:
@@ -98,22 +90,17 @@ env:
   WEBROOT: /var/www/app
 ```
 
-### Shared Definitions
-
-You can share definitions across server types with `./servers/defaults.yml`
-
-```yaml
-private_key_path: /Users/bhilkert/.ssh/pd-app-server
-```
-
+File declared in files and scripts can point to anywhere in the machine
+from which you make the provision. The file path is calculated relative
+to `./provision` directory. These files/scripts will then be uploaded to
+provisioned server at ~/files and ~/scripts
 
 ### Passing variables to scripts
 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.
+That way you can re-use the same scripts for different type of servers.
 
 ## Provision your server
-`simpro my-awesome-server root@my-host`
+`bundle exec simpro my-awesome-server root@my-host`
 
 ## Contributing
 

data/lib/simple_provision/configuration.rb

@@ -18,7 +18,7 @@ module SimpleProvision
 
     def default_options
       begin
-        YAML.load(File.read('servers/defaults.yml'))
+        YAML.load(File.read(server_file))
       rescue Errno::ENOENT
         {}
       end
@@ -28,12 +28,12 @@ module SimpleProvision
       begin
         YAML.load(File.read(server_file))
       rescue Errno::ENOENT
-        raise MissingServerConfiguration, "Please create a configuration file './servers/#{profile}.yml'"
+        raise MissingServerConfiguration, "Please create a configuration file './#{server_file}'"
       end
     end
 
     def server_file
-      "servers/#{profile}.yml"
+      "provision/servers/#{profile}.yml"
     end
 
     def read_and_parse_server_options

data/lib/simple_provision/scp.rb

@@ -21,32 +21,48 @@ module SimpleProvision
       includes = files + scripts
 
       if includes.empty?
-        raise "Both files and scripts are empty. You should provide some"
+        raise "Both files and scripts are empty. You should provide some."
       end
 
-      system("mkdir tmp")
-      system("mkdir tmp/files")
-      system("mkdir tmp/scripts")
-      files.each do |f|
-        system("cp #{f} tmp/files/")
-      end
-      scripts.each do |f|
-        system("cp #{f} tmp/scripts/")
-      end
+      cmds = [
+        "cd provision",
+        "rm -rf tmp",
+        "mkdir tmp",
+        "mkdir tmp/files",
+        "mkdir tmp/scripts"
+      ]
+
+      files.each { |f| cmds << "cp #{f} tmp/files/"}
+
+      scripts.each { |f| cmds << "cp #{f} tmp/scripts/" }
 
-      system("cd tmp && tar -czf #{FILENAME} files/ scripts/")
+      cmds << "cd tmp && tar -czf #{FILENAME} files/ scripts/"
+
+      if ENV["VERBOSE"]
+        puts "==============Execute Locally============"
+        puts cmds.join("\n")
+        puts "========================================="
+      end
+      system cmds.join("\n")
     end
 
     def scp_files_to_server
+      path = "provision/tmp/#{FILENAME}"
+
       Net::SCP.start(@host, @username) do |scp|
-        scp.upload!("tmp/#{FILENAME}", ".")
+        scp.upload!(path, ".")
       end
     rescue Net::SSH::HostKeyMismatch
       puts "Please run ssh #{@username}@#{@host} to verify the fingerprint first"
     end
 
     def remove_local_archive
-      `rm -rf tmp`
+      cmds = [
+        "cd provision",
+        "rm -rf tmp"
+      ]
+
+      system cmds.join("\n")
     end
   end
 end

data/lib/simple_provision/version.rb

@@ -1,3 +1,3 @@
 module SimpleProvision
-  VERSION = "0.99.8"
+  VERSION = "0.99.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_provision
 version: !ruby/object:Gem::Version
-  version: 0.99.8
+  version: 0.99.9
 platform: ruby
 authors:
 - Phuong Gia Su
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler