dolphin 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac3d20cc20468e892bc507f3d9ea5ed5299fb0c
-  data.tar.gz: 34571054862171bcb5c5b2a07cb139ad50e1a318
+  metadata.gz: 0cdebd25f15c7ca3178f5b20d2fcf659ddac74c1
+  data.tar.gz: bd3f80a28f9c699457432c035aab9d56f741aa27
 SHA512:
-  metadata.gz: ba8dca1fa842d00e46e5df3737906b17ef06ea60a2f18117868c1b93516a6d4e93577fb4ac6ddab6cce9efb9c0bb4fe8252748ac11dee693e006f1a35b628a7c
-  data.tar.gz: 9b7812bfa96f1a0f87b29809b2b3b533865e495995f543192e333cf32e237a5f5fc501464b2c44a2b45c2be421474f5fc74adbec2190fbc3ac906d94485f2308
+  metadata.gz: 9a8cbd6cda2c393fc43ec56837d8945c6fa5158328b7aeddadc8a8c6143c3b0215c6e716527ac1eee52b37ad0cf427ba82047c331a0e684eb6cacfe781f1e408
+  data.tar.gz: 40c74e0f464376b848e2e5a099a07eb7abbbe4a5a43245451404e70238ac3d12c03d15da0edbaa83afe0109610619d31f05a7062fb30d7b66bc3feb513b9da8d

data/README.md

@@ -45,26 +45,28 @@ Edit the bin/dolphin script generated as above to adjust settings. Please refer
     @application = 'best_app'
     # on server, the user account for deploying
     @user = 'deploy'
+    # on server, the user group for deploying
+    @user_group = 'deploy'
     # location of git repository
     @github = "git@github.com:nengxu/dolphin.git"
 
     case @env
     when 'qa'
-      @servers = [
-        'qa01.best_app.com',
-        'qa02.best_app.com',
-      ]
+      @server_hash = {
+        q1: 'qa01.best_app.com',
+        q2: 'qa02.best_app.com',
+      }
     when 'production'
-      @servers = [
-        'prod01.best_app.com',
-        'prod02.best_app.com',
-      ]
+      @server_hash = {
+        p1: 'prod01.best_app.com',
+        p2: 'prod02.best_app.com',
+      }
     else # @env == 'alpha'
       # list of servers for this environment
-      @servers = [
-        'dev01.best_app.com',
-        'dev02.best_app.com',
-      ]
+      @server_hash = {
+        d1: 'dev01.best_app.com',
+        d2: 'dev02.best_app.com',
+      }
       # customized branch, default is the same as @env
       @branch = 'master'
     end
@@ -199,6 +201,28 @@ For example, you can start puma in production mode on your local machine:
 
     bin/dolphin puma start -e production -l
 
+### Deploy to one specific server
+
+Sometimes we need to take some actions on only one specific server. Just pass the --target (or -t for short) option when issue command. Notice that in @server_hash, we difine a key-value pair for each server. So we only need to pass the key for that specific server as the -t option.
+
+    bin/dolphin nginx conf -t q2
+
+Relevant settings in bin/dolphin are:
+
+    case @env
+    when 'qa'
+      @server_hash = {
+        q1: 'qa01.best_app.com',
+        q2: 'qa02.best_app.com',
+      }
+
+    # apply to one target server
+    if options[:target]
+      @servers = [
+        @server_hash[options[:target].to_sym],
+      ]
+    end
+
 ## Extend with custom modules
 
 To extend dolphin's functionality with your custom modules is easy. It is Ruby anyway. For example, to add Centos related functions:

data/lib/dolphin/base.rb

@@ -10,8 +10,12 @@ class Dolphin::Base < Thor
 # class options
 # =============================================================================
 
-  class_option :env, :aliases => '-e', :type => :string, :default => 'alpha'
-  class_option :local, :aliases => '-l', :type => :boolean, :default => false
+  # deploy environment
+  class_option :env, aliases: '-e', type: :string, default: 'alpha'
+  # deploy to one specific target server
+  class_option :target, aliases: '-t', type: :string, default: nil
+  # deploy to localhost
+  class_option :local, aliases: '-l', type: :boolean, default: false
 
   def initialize(args=[], options={}, config={})
     super(args, options, config)

data/lib/dolphin/setup.rb

@@ -1,8 +1,8 @@
 # set up target servers
 class Dolphin::Setup < Dolphin::Base
 
-  desc "chruby", "install chruby"
-  def chruby
+  desc "chruby", "install/update chruby"
+  def chruby(version='v0.3.6')
     menu = [
       "
         # git clone
@@ -10,8 +10,10 @@ class Dolphin::Setup < Dolphin::Base
         cd chruby
         # update
         git fetch
+        git checkout master
+        git rebase origin/master
         # checkout tag
-        git checkout v0.3.6
+        git checkout #{version}
         # install
         sudo make install
       ",
@@ -20,7 +22,19 @@ class Dolphin::Setup < Dolphin::Base
     execute menu
   end
 
-  desc "ruby_install", "update ruby_install"
+  desc "app_dir", "set up app dir"
+  def app_dir
+    menu = [
+      "
+        sudo mkdir -p #{@app_dir}
+        sudo chown #{@user}:#{@user_group} #{@app_dir}
+      ",
+    ]
+
+    execute menu
+  end
+
+  desc "ruby_install", "install/update ruby_install"
   def ruby_install(version='master')
     menu = [
       "
@@ -29,6 +43,8 @@ class Dolphin::Setup < Dolphin::Base
         cd ruby-install
         # update
         git fetch
+        git checkout master
+        git rebase origin/master
         # checkout tag
         git checkout #{version}
         # install
@@ -41,6 +57,13 @@ class Dolphin::Setup < Dolphin::Base
 
   desc "repo", "repository set up."
   def repo
+    # branch 'master' is always created by git
+    if @branch == 'master'
+      cmd = "git checkout master"
+    else
+      cmd = "git checkout -b #{@branch} origin/#{@branch}"
+    end
+
     menu = [
       "
         # init git repository
@@ -50,7 +73,7 @@ class Dolphin::Setup < Dolphin::Base
       "
         # set up tracking branch
         cd #{@deploy_dir}
-        git checkout -b #{@branch} origin/#{@branch}
+        #{cmd}
       ",
     ]
 

data/lib/dolphin/version.rb

@@ -1,3 +1,3 @@
 module Dolphin
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/generators/dolphin/templates/dolphin

@@ -17,6 +17,8 @@ class Dolphin::Base
     @application = 'best_app'
     # on server, the user account for deploying
     @user = 'deploy'
+    # on server, the user group for deploying
+    @user_group = 'deploy'
     # location of git repository
     @github = "git@github.com:nengxu/dolphin.git"
 
@@ -48,29 +50,26 @@ class Dolphin::Base
     @env = @branch =options[:env]
 
     case @env
-    when 'local'
-      @servers = [
-        'localhost',
-      ]
     when 'qa'
-      @servers = [
-        'qa01.best_app.com',
-        'qa02.best_app.com',
-      ]
+      @server_hash = {
+        q1: 'qa01.best_app.com',
+        q2: 'qa02.best_app.com',
+      }
     when 'production'
-      @servers = [
-        'prod01.best_app.com',
-        'prod02.best_app.com',
-      ]
+      @server_hash = {
+        p1: 'prod01.best_app.com',
+        p2: 'prod02.best_app.com',
+      }
     else # @env == 'alpha'
       # list of servers for this environment
-      @servers = [
-        'dev01.best_app.com',
-        'dev02.best_app.com',
-      ]
+      @server_hash = {
+        d1: 'dev01.best_app.com',
+        d2: 'dev02.best_app.com',
+      }
       # customized branch, default is the same as @env
       @branch = 'master'
     end
+    @servers = @server_hash.values
 
     # running in local mode
     if options[:local]
@@ -83,6 +82,13 @@ class Dolphin::Base
       ]
     end
 
+    # apply to one target server
+    if options[:target]
+      @servers = [
+        @server_hash[options[:target].to_sym],
+      ]
+    end
+
     # ===================================
     # settings to avoid simultaneous deployments
     # ===================================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolphin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Neng Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor