deploy_docus 0.0.2 → 0.0.3

data/lib/deploy_docus/base.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'json'
 
 module DeployDocus
   class Base < Sinatra::Base
@@ -12,10 +13,11 @@ module DeployDocus
       config = DeployDocus::Config.new(params[:application])
       deployer = DeployDocus::Deployer.new(config['repository'], "keys/#{params[:application]}_rsa", config.deploy_task(params[:environment]))
 
+      content_type :json
       if deployer.deploy!
-        "OK"
+        {:status => "OK"}.to_json
       else
-        "NOT OK"
+        {:status => "NOT OK", :error => deployer.errors}.to_json
       end
     end
   end

data/lib/deploy_docus/deployer.rb

@@ -1,10 +1,17 @@
 require 'git-ssh-wrapper'
+require 'active_model'
 
 module DeployDocus
   class Deployer
+    include ActiveModel::Validations
+
     attr_reader :repository, :ssh_key, :deploy_task
     attr_accessor :wrapper
 
+    validates :repository,  :presence => {:allow_blank => false}
+    validates :ssh_key,     :presence => {:allow_blank => false}
+    validates :deploy_task, :presence => {:allow_blank => false}
+
     #
     # Manages cloning and deploying the repository
     # This class is agnostic of any web interface and can be used as a library
@@ -15,15 +22,19 @@ module DeployDocus
     # And execute the deploy_task on it.
     #
     def initialize(repository, ssh_key, deploy_task)
-      @repository, @ssh_key, @deploy_task = repository, File.expand_path(ssh_key), deploy_task
+      ssh_key = File.expand_path(ssh_key) if ssh_key
+      @repository, @ssh_key, @deploy_task = repository, ssh_key, deploy_task
     end
 
     def deploy!
-      GitSSHWrapper.with_wrapper(:private_key => ssh_key) do |w|
-        wrapper = w
-
-        clone
-        run_deploy
+      if self.valid?
+        GitSSHWrapper.with_wrapper(:private_key_path => ssh_key) do |w|
+          @wrapper = w
+
+          clone && run_deploy
+        end
+      else
+        false
       end
     end
 
@@ -31,12 +42,14 @@ module DeployDocus
     private
     def clone
       puts "cloning #{repository}"
-      %x[#{@wrapper ? 'env ' + @wrapper.git_ssh : ''} git clone #{repository} #{tmp}]
+      %x[#{wrapper.nil? ? '' : 'env ' + @wrapper.git_ssh} git clone #{repository} #{tmp}]
+      $?.exitstatus == 0
     end
 
     def run_deploy
       puts "deploying : #{deploy_task}"
-      %x[#{@wrapper ? 'env ' + @wrapper.git_ssh : ''} cd #{tmp}; #{deploy_task}]
+      %x[#{wrapper.nil? ? '' : 'env ' + @wrapper.git_ssh} cd #{tmp}; #{deploy_task}]
+      $?.exitstatus == 0
     end
 
     def tmp

data/lib/deploy_docus/generators/new.rb

@@ -0,0 +1,19 @@
+require 'thor/group'
+
+module DeployDocus
+  module Generators
+    class New < Thor::Group
+      include Thor::Actions
+
+      argument :name
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def copy_files
+        directory "templates/new", name
+      end
+    end
+  end
+end

data/lib/deploy_docus/generators/templates/new/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'deploy_docus', :path => '../deploy_docus'

data/lib/deploy_docus/generators/templates/new/Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup -p $PORT

data/lib/deploy_docus/generators/templates/new/config.ru

@@ -0,0 +1,5 @@
+require "rubygems"
+require "bundler/setup"
+require 'deploy_docus'
+
+run DeployDocus

data/lib/deploy_docus/generators/templates/new/config.yml

@@ -0,0 +1,4 @@
+website:
+  repository: git@github.com:evome/evome.git
+  deploy_task:
+    staging: git push git@heroku.com:evome-staging.git

data/lib/deploy_docus/generators.rb

@@ -0,0 +1,5 @@
+module DeployDocus
+  module Generators
+    autoload :New, 'deploy_docus/generators/new'
+  end
+end

data/lib/deploy_docus/version.rb

@@ -1,3 +1,3 @@
 module DeployDocus
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/deploy_docus.rb

@@ -6,6 +6,7 @@ module DeployDocus
   autoload :Deployer, 'deploy_docus/deployer'
   autoload :Version, 'deploy_docus/version'
   autoload :Config, 'deploy_docus/config'
+  autoload :Generators, 'deploy_docus/generators'
 
   def self.call(env)
     Base.call(env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_docus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124010776780 !ruby/object:Gem::Requirement
+  requirement: &70277829594420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124010776780
+  version_requirements: *70277829594420
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70124010776140 !ruby/object:Gem::Requirement
+  requirement: &70277829594000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124010776140
+  version_requirements: *70277829594000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70124010775620 !ruby/object:Gem::Requirement
+  requirement: &70277829593460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124010775620
+  version_requirements: *70277829593460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70124010774880 !ruby/object:Gem::Requirement
+  requirement: &70277829592920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124010774880
+  version_requirements: *70277829592920
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70124010774260 !ruby/object:Gem::Requirement
+  requirement: &70277829592380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124010774260
+  version_requirements: *70277829592380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70124010773500 !ruby/object:Gem::Requirement
+  requirement: &70277829591720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70124010773500
+  version_requirements: *70277829591720
 - !ruby/object:Gem::Dependency
   name: git-ssh-wrapper
-  requirement: &70124010772900 !ruby/object:Gem::Requirement
+  requirement: &70277829591280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124010772900
+  version_requirements: *70277829591280
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70277829578380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70277829578380
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70277829577880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70277829577880
 description: Deploy your application with a POST request
 email: dev@evome.fr
 executables: []
@@ -98,6 +120,13 @@ files:
 - lib/deploy_docus/base.rb
 - lib/deploy_docus/config.rb
 - lib/deploy_docus/deployer.rb
+- lib/deploy_docus/generators.rb
+- lib/deploy_docus/generators/new.rb
+- lib/deploy_docus/generators/templates/new/Gemfile
+- lib/deploy_docus/generators/templates/new/Procfile
+- lib/deploy_docus/generators/templates/new/config.ru
+- lib/deploy_docus/generators/templates/new/config.yml
+- lib/deploy_docus/generators/templates/new/keys/.gitkeep
 - lib/deploy_docus/version.rb
 homepage: https://github.com/evome/deploy_docus
 licenses: []