gploy 0.1.4 → 0.1.5

data/README.markdown

@@ -1,4 +1,8 @@
-This is version 0.1.4, it has small change in the code, removing some duplication. Also a new method for logs, and other functionality that is now the only gem wheel task migration database when necessary.
+Version 0.1.5 brings some improvements in the way it will deploy.
+
+Notes Version 0.1.5
+A new command called gploy -d
+The log file was also changed to indicate that the command was run locally or remotely.
 
 ## Introduction
 
@@ -7,8 +11,8 @@ This is a simple RubyGems to configure your Rails Project for deployment using g
 ## What directory structure is used
 This gem use a structure in webserver like this:
 
-	1. ~/repos  -> For host a git repository
-	2. ~/rails_app -> For host your production project
+	1. ~/repos       -> For host a git repository
+	2. ~/rails_app   -> For host your production project
 	3. ~/public_html -> For create a  symlink to the project in rails_app directory 
 
 ## Files generated
@@ -24,7 +28,7 @@ The contents of this file must be like this:
 	      password: password
 	      app_name: project_name
 	      origin: git origin
-	
+		
 If your git is already configured for origin use another, for example: production
 
 ### The post-receive file:
@@ -72,8 +76,9 @@ Finally now you can run the command that will upload your project to the server
 
 If no error occurs, your project must be available now.
 
-From now when you want update your project simply do a commit of changes and run git push production master to update project in server.
-
+From now when you want update your project simply do a commit of changes and run git push production master to update project in server or run:
+   
+	> gploy -d
 #OBS: This is a initial version then careful when using it. If you find bugs please let me know, fell free for make a fork in project at [github](http://github.com/edipofederle/gploy) and fix the bugs :D.
 
 

data/Rakefile

@@ -5,12 +5,20 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
  
 GEM = "gploy"
-GEM_VERSION = "0.1.4"
+GEM_VERSION = "0.1.5"
 SUMMARY = "Simple gem to configure rails project deploy using git(locaweb server only)"
 AUTHOR = "Edipo Luis Federle"
 EMAIL = "edipofederle@gmail.com"
 HOMEPAGE = "http://edipolf.com"
 
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+  t.spec_files = FileList['spec/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+  
+end
  
 spec = Gem::Specification.new do |s|
   s.name = GEM

data/bin/gploy

@@ -1,31 +1,30 @@
 #!/usr/bin/env ruby
 require "rubygems"
 require "rubigen"
+require "gploy"
 
 if %w(-v --version).include? ARGV.first
-  require "gploy"
   puts "#{File.basename($0)} - #{Gploy::Configure::VERSION}"
   exit(0)
 end
 
 if %(-configure -c).include? ARGV.first
-  require "gploy"
   c = Gploy::Configure.new
   c.configure_server
 end
 if %(-pr).include? ARGV.first
-  require "gploy"
   c = Gploy::Configure.new
   c.configure_hook
 end
 if %(-setup -s).include? ARGV.first
-  require "gploy"
   c = Gploy::Configure.new
   c.setup
 end
 if %(-update-hook -uh).include? ARGV.first
-  require "gploy"
   c = Gploy::Configure.new
   c.upload_hook
 end
-
+if %(-deploy -d).include? ARGV.first
+  c = Gploy::Configure.new
+  c.new_deploy
+end

data/lib/gploy/configure.rb

@@ -8,14 +8,12 @@ module Gploy
   class Configure
     
     include Helpers
-    VERSION = '0.1.3'
-   
- 
+    VERSION = '0.1.5'
+
     def configure_server
       create_file_and_direcotry_unless_exists("config", "config.yaml")
       puts "Files created into the config directory. Now need edit config.yaml"
       puts ""
-      puts "A suggestion for you"
       puts "---------------------------------------------------------"
       puts "You can put this content into your config.yaml file and edit it"
       post_commands_server
@@ -52,6 +50,15 @@ module Gploy
       update_hook(@user, @url, @app_name)
       puts "File successfully Updated"
     end
+    
+    def read_config_file
+      config = YAML.load_file("config/config.yaml")
+      config["config"].each { |key, value| instance_variable_set("@#{key}", value) }
+    end
+    
+    def remote
+      @shell = start(@url, @user, @password)
+    end
 
     def path
       "config/post-receive"
@@ -62,15 +69,6 @@ module Gploy
       restart_server(@app_name)
     end
     
-    def read_config_file
-      config = YAML.load_file("config/config.yaml")
-      config["config"].each { |key, value| instance_variable_set("@#{key}", value) }
-    end
-  
-    def remote
-      @shell = start(@url, @user, @password)
-    end
-  
     def start(server, user, pass)
       Net::SSH.start(server, user, :password => pass)
     end
@@ -115,6 +113,11 @@ module Gploy
     def add_remote_origin(server, user, name, origin)
       run_remote("cd rails_app/#{name}/ && git remote add #{origin} ~/repos/#{name}.git/")
     end
+    
+    def new_deploy
+      read_config_file
+      run_local("git checkout #{@branch} - && git push #{@origin} master")
+    end
   
     def clone(name)
       @shell.exec!("git clone ~/repos/#{name}.git ~/rails_app/#{name}")
@@ -125,11 +128,12 @@ module Gploy
     end
     
     def push_local(origin)
-      run_local "git push #{origin} master"
+      run_local "git checkout master && git push #{origin} master"
     end
     
     def tmp_create(name)
       run_remote "cd rails_app/#{name}/ && mkdir tmp"
     end
+    
   end
 end

data/lib/gploy/helpers.rb

@@ -4,22 +4,22 @@ module Gploy
     
     def check_if_dir_log_exists
       unless dirExists?("log")
-        Dir.mkdir("log")
+        Dir.mkdir("log") 
         false
       else
         true
       end
     end
     
-    def logger(msg)
+    def logger(msg, type)
       puts "--> #{msg}"
       File.open(LOG_PATH, 'a+') do |f|
-        f.puts "#{Time.now} => #{msg}"
+        f.puts "#{Time.now} => |#{type}| #{msg}"
       end
     end
     
     def run_remote(command)
-      logger(command)
+      logger(command, "remote")
       @shell.exec!(command)
     end
 
@@ -28,24 +28,14 @@ module Gploy
     end
 
     def run_local(command)
-      logger(command)
+      logger(command, "local")
       Kernel.system command
     end
 
     def sys_link(name)
       run_remote "ln -s ~/rails_app/#{name}/public ~/public_html/#{name}"
     end
-
-    def read_hook_sample(name)
-      puts "Escrevendo Hook File"
-      path = "~/repos/#{name}.git/hooks/post-receive"
-      File.open("config/post-receive", "r") do |fline|
-        while(line = fline.gets)
-          @shell.exec!("echo '#{line}' >> #{path}")
-        end
-      end
-    end
-
+    
     def update_hook_into_server(username, url, name)
       run_local "chmod +x config/post-receive && scp config/post-receive #{username}@#{url}:repos/#{name}.git/hooks/"
     end
@@ -64,15 +54,15 @@ module Gploy
 
     def migrate(name)
       if useMigrations?
-        logger("Run db:migrate")
+        logger("Run db:migrate", "remote")
         run_remote "cd rails_app/#{name}/ && rake db:migrate RAILS_ENV=production"
       end
-      logger("Projet dont use Migrations yet")
+      logger("rake db:migrae => FALSE", nil)
     end
 
     def restart_server(name)
+      logger("restart server", "remote")
       run_remote "cd rails_app/#{name}/tmp && touch restart.txt"
-      puts "Server Restarted"
     end
 
     def post_commands
@@ -84,7 +74,7 @@ module Gploy
         env -i rake db:migrate RAILS_ENV=production
         env -i touch ~/rails_app/#{@app_name}/tmp/restart.txt 
 CMD
-        puts commands
+         puts commands
     end
 
     def post_commands_server

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Edipo Luis Federle
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -03:00
+date: 2010-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency