ratchetify 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a4b8fdc1b6691a5ca19a8c95f91378178668bf7
-  data.tar.gz: e301d5942f39c709b69c8f434dab192d63882fae
+  metadata.gz: a76ccc5d84132a339b64b9f4c05e432f008300f8
+  data.tar.gz: 5604850d28b106ddeaaf5de947d8a69952c1c679
 SHA512:
-  metadata.gz: 7d620f93eee909490c77afcb898ef4842997f91cbe23a058c15e559dc2de18b125142c68f19489f0437fd2e0e5a2d25cb9aaf97da8f9459976cfca4135ce29e2
-  data.tar.gz: ce3371bd8f427d0113de5a38db17d00d20784af94a999a6961cae738534aecf3944fa7d3c82a7edc1e905357e090094fd7caf1edbad592fdb1898916152b0476
+  metadata.gz: b07f528704f0fb8294b59c00df9e86c186e60af260e917135b092420a6dd26966115085fd22f325e6f25c638c0f7c155d56d863240918e47e647402d4186ed00
+  data.tar.gz: d489bf3acf6e5a96be62a8a58f7b23f66828fdc531c475cedadb685afae60652a13cf4918b8b2f412e5254ded05bee591032bf09d8b87e393f354564bd1ce2aa

data/lib/ratchetify/git.rb

@@ -0,0 +1,48 @@
+
+Capistrano::Configuration.instance.load do
+  
+  require 'capistrano'
+  require 'ratchetify/helpers'
+  
+  desc "Create and update repositories"
+  namespace :git do
+    
+    desc "Clone a repository"
+    task :clone_repo do
+      # clone the repo first
+      git_cmd = "cd #{deploy_root} && git clone #{fetch :repo} #{fetch :application}"
+      
+      run git_cmd do |channel, stream, out|
+        if out =~ /Password:/
+          channel.send_data("#{fetch :repo_password}\n")
+        else
+          puts out
+        end
+      end
+      
+      # switch to the specified branch
+      run "cd #{deploy_dir} && git checkout -b #{fetch :branch}" unless on_branch? deploy_dir, "#{fetch :branch}"
+      
+    end # task :create
+    
+    desc "Update a repository"
+    task :update_repo do
+      # switch to the specified branch
+      run "cd #{deploy_dir} && git checkout -b #{fetch :branch}" unless on_branch? deploy_dir, "#{fetch :branch}"
+      
+      # update the repo
+      git_cmd = "cd #{deploy_dir} && git pull origin #{fetch :branch}"
+      
+      run git_cmd do |channel, stream, out|
+        if out =~ /Password:/
+          channel.send_data("#{fetch :repo_password}\n")
+        else
+          puts out
+        end
+      end
+          
+    end # end update
+    
+  end
+  
+end

data/lib/ratchetify/rails.rb

@@ -7,8 +7,10 @@ Capistrano::Configuration.instance.load do
   require 'ratchetify/domain'
   require 'ratchetify/service'
   require 'ratchetify/db'
+  require 'ratchetify/git'
   
   before "create:rails", "setup:environment"
+  before "create:rails", "git:clone_repo"
   before "create:rails", "db:create"
   after "create:rails", "service:create"
   after "create:rails", "service:create_reverse_proxy"
@@ -19,28 +21,10 @@ Capistrano::Configuration.instance.load do
     
     desc "Deploy a RAILS app to uberspace"
     task :rails do
-      create_repo
       config_rails_app
       finalize
     end
     
-    task :create_repo do
-      # clone the repo first
-      git_cmd = "cd #{deploy_root} && git clone #{fetch :repo} #{fetch :application}"
-      
-      run git_cmd do |channel, stream, out|
-        if out =~ /Password:/
-          channel.send_data("#{fetch :repo_password}\n")
-        else
-          puts out
-        end
-      end
-      
-      # switch to the specified branch
-      run "cd #{deploy_dir} && git checkout -b #{fetch :branch}" unless on_branch? deploy_dir, "#{fetch :branch}"
-      
-    end # task :create_repo
-    
     task :config_rails_app do
       # run bundle install first
       run "cd #{deploy_dir} && bundle install --path ~/.gem"

data/lib/ratchetify/update.rb

@@ -4,8 +4,10 @@ Capistrano::Configuration.instance.load do
   require 'capistrano'
   require 'ratchetify/helpers'
   require 'ratchetify/service'
+  require 'ratchetify/git'
   
   before :update, "service:stop"
+  before :update, "git:update_repo"
   after :update, "service:start"
   
   desc "Tasks to update an app"
@@ -13,23 +15,6 @@ Capistrano::Configuration.instance.load do
     
     desc "Stop the service, update the app then restart"
     task :default do
-      # switch to the specified branch
-      run "cd #{deploy_dir} && git checkout -b #{fetch :branch}" unless on_branch? deploy_dir, "#{fetch :branch}"
-      
-      # update the repo
-      git_cmd = "cd #{deploy_dir} && git pull origin #{fetch :branch}"
-      
-      run git_cmd do |channel, stream, out|
-        if out =~ /Password:/
-          channel.send_data("#{fetch :repo_password}\n")
-        else
-          puts out
-        end
-      end
-      
-      #
-      # typical RAILS stuff to finalize
-      #
       
       # run bundle install first
       run "cd #{deploy_dir} && bundle install --path ~/.gem"

data/lib/ratchetify/version.rb

@@ -1,3 +1,3 @@
 module Ratchetify
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/lib/ratchetify.rb

@@ -14,6 +14,7 @@ Capistrano::Configuration.instance.load do
   require 'ratchetify/php'
   require 'ratchetify/update'
   require 'ratchetify/db'
+  require 'ratchetify/git'
   require 'ratchetify/help' # monkey patched from capistrano
   
   # host and domain for the new app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratchetify
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Michael Kuehl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -58,6 +58,7 @@ files:
 - lib/ratchetify/base.rb
 - lib/ratchetify/db.rb
 - lib/ratchetify/domain.rb
+- lib/ratchetify/git.rb
 - lib/ratchetify/help.rb
 - lib/ratchetify/helpers.rb
 - lib/ratchetify/php.rb