unfold 1.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acfd463411021cc886e7183e6e7eddb009715b42
-  data.tar.gz: 3e04e322affa8f3404a01fe576154427f452a0e6
+  metadata.gz: 2c128e5e9a0ffba8a2c01e9ee8485690584ddc87
+  data.tar.gz: d563032c64610b5348b09a11b37614b9cceb7ce3
 SHA512:
-  metadata.gz: 2c54f52a934eb52e4c24a561c76309c6eaf9606b408991cb6730c7480cd6114c9361a45016450d450c7d093f7856820ce8ac47705bab549a2598eae4f0bbab70
-  data.tar.gz: 1dd4ffde2821b8df669fd3db9b9f5f96d4e882b199f4bc832c7df1e2334ab6ff972c66c923753b770d66f4ed179c4f304b7cc1c3d9c49d91f4da9574d8af30da
+  metadata.gz: 7e0a0c8534183bfa86f3d199fa115325fba6e27a89ae7dec1c41764c4f11108439a2eb4464c9d0c002e229dd13921a6021ca5e3edc620fa992c1d0e368ec93db
+  data.tar.gz: 1152007a66d85110722e763fed3015f158ab3614014bdf11965193db7b3fdea3c37385496ce286fcfb1678cf68b01954bdeb5d16bb86c02fda93d21732c2720f

data/bin/uf

@@ -18,7 +18,7 @@ when "teardown"
   case ARGV[1]
   when "local"
     Unfold.teardown(true, false)
-  when "server"
+  when "remote"
     Unfold.teardown(false, true)
   when "both"
     Unfold.teardown(true, true)

data/lib/unfold.rb

@@ -3,10 +3,22 @@ require "net/ssh"
 require "net/scp"
 require "stringio"
 
+CONFIG_RELATIVE = "/config/unfold.rb"
+
+class File
+  def self.git_root
+    `git rev-parse --show-toplevel`.strip
+  end
+end
+
 module Unfold
+  class Config
+    attr_accessor :remote_host, :remote_user, :remote_destination, :appname, :env
+  end
+  
   # the method used in the config file
   def self.config(env_arrays)
-    return nil if block_given? == false
+    return [] if block_given? == false
     configs = []
     env_arrays.each do |env|
       config = Config.new
@@ -17,56 +29,49 @@ module Unfold
     return configs
   end
   
-  class Config
-    attr_accessor :remote_host, :remote_user, :remote_destination, :appname, :env
-  end
-  
   # creates a post-receive hook script from an Unfold::Config object
   def self.post_receive_script(c)
-    log_location = "~/.unfold/logs/#{c.appname}-#{c.env}/deploy.log"
-    postdep = "#{c.remote_destination}/config/unfold_postdeploy.rb"
-    return %{
-      #!/bin/bash
-      read oldrev newrev refname
+    return %{#!/bin/bash
+read oldrev newrev refname
       
-      deploy() {
-        if [ "$refname" = "refs/heads/master" ]; then
-          unset GIT_DIR
-          echo "Unfold: Deploying $newrev" >> #{log_location}
-          cd #{c.remote_destination}
-          pwd >> #{log_location}
-          git pull origin master > /dev/null 2> /dev/null
-          echo "Unfold: SUCCESS! Deployed $newrev" >> #{log_location}
-          if [ -f #{postdep} ]; then
-            bash -lc "ruby #{postdep}"
-          fi
-        fi
-      }
-      deploy
-    }
+deploy() {
+  if [ "$refname" = "refs/heads/master" ]; then
+    unset GIT_DIR
+    cd #{c.remote_destination}
+    git pull origin master > /dev/null 2> /dev/null
+    echo "\rUNFOLD: Deployed $newrev"
+    if [ -f config/unfold_postdeploy.rb ]; then
+      bash -lc "ruby config/unfold_postdeploy.rb"
+    fi
+  fi
+}
+deploy}
   end
   
+  # loads config from config ruby script
   def self.read_config
-    eval(File.read("#{`git rev-parse --show-toplevel`.strip}/config/unfold.rb"))
+    eval(File.read(File.git_root + CONFIG_RELATIVE))
   end
   
+  # DRYs up the setup and teardown code
   def self.ssh(c)
     return nil if block_given? == false
     Net::SSH.start(c.remote_host, c.remote_user) do |ssh|
-      # get the home directory
-      path = ssh.exec!("cd; pwd").strip
-      
-      # setup paths
-      repo_path = "#{path}/.unfold/repos/#{c.appname}-#{c.env}.git" # doesn't include ~/ so that it can be used in the remote url
-      logs_path = "#{path}/.unfold/logs/#{c.appname}-#{c.env}/"
-      yield(ssh,{ :repo => repo_path, :logs => logs_path })
+      home_path = ssh.exec!("cd; pwd").strip # home directory
+      repo_path = "#{home_path}/.unfold/repos/#{c.appname}-#{c.env}.git"
+      yield(ssh,{ :repo => repo_path })
     end
   end
   
   def self.teardown(local, remote)
     Unfold.read_config.each do |c|
-      `git remote remote #{c.env}` if local == true
-      Unfold.ssh c { |ssh, paths| ssh.exec!("rm -rf #{paths[:repo]}; rm -rf #{paths[:logs]}") } if remote == true
+      `git remote remove #{c.env}` if local == true
+      
+      if remote == true
+        Unfold.ssh c do |ssh, paths| 
+          ssh.exec!("rm -rf #{paths[:repo]}") 
+        end 
+      end
     end
   end
   
@@ -74,7 +79,7 @@ module Unfold
     Unfold.read_config.each do |c|
       if c.env == envi
         Unfold.ssh c do |ssh, paths| 
-          print ssh.exec!("cd #{c.remote_destination}; pwd; git reset --hard #{revision}")
+          print ssh.exec!("cd #{c.remote_destination}; git reset --hard #{revision}")
         end
       end
     end
@@ -88,12 +93,11 @@ module Unfold
     end
   end
 
-  def self.setup_remote()
+  def self.setup_remote
     Unfold.read_config.each do |c|
       Unfold.ssh c do |ssh, paths|
         # create the remote repo
-        ssh.exec!("mkdir -p #{paths[:repo]}; mkdir -p #{paths[:logs]}")
-        ssh.exec!("cd #{paths[:repo]}; git --bare init")
+        ssh.exec!("mkdir -p #{c.remote_destination}; mkdir -p #{paths[:repo]}; cd #{paths[:repo]}; git --bare init")
         
         # upload the post-receive hook
         script = StringIO.new(Unfold.post_receive_script(c))

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: unfold
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.1
 platform: ruby
 authors:
 - Nathaniel Symer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Dead simple git deployment with minimal config.