gitploy 0.2.0 → 0.2.1

data/README.markdown

@@ -19,7 +19,6 @@ strategy. No hooks, very little behind-the-scenes magic - it just does what you
     require 'gitploy/script'
 
     configure do |c|
-      c.repo = 'git@github.com:myuser/fooapp.git'
       c.path = '/var/www/fooapp'
 
       stage :staging do
@@ -37,6 +36,8 @@ strategy. No hooks, very little behind-the-scenes magic - it just does what you
       remote do
         run "mkdir -p #{config.path}"
         run "cd #{config.path} && git init"
+        run "git config --bool receive.denyNonFastForwards false"
+        run "git config receive.denyCurrentBranch ignore"
       end
     end
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/gitploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gitploy}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Dillingham"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-29}
   s.default_executable = %q{gitploy}
   s.description = %q{Dead-simple deployments. No, for real this time.}
   s.email = %q{brentdillingham@gmail.com}

data/lib/gitploy.rb

@@ -3,8 +3,9 @@ module Gitploy
   attr_accessor :config
 
   class Config
-    REQUIRED_OPTIONS = [:repo, :path, :user, :host]
+    REQUIRED_OPTIONS = [:path, :user, :host]
     attr_accessor *REQUIRED_OPTIONS
+    attr_accessor :local_branch, :remote_branch
 
     def check!
       unless missing_options.empty?
@@ -20,6 +21,10 @@ module Gitploy
   def configure
     config = Config.new
     yield config; config.check!
+
+    config.local_branch ||= current_branch
+    config.remote_branch ||= 'master'
+
     self.config = config
   end
 
@@ -66,7 +71,7 @@ module Gitploy
   end
 
   def push!
-    local { run "git push #{config.user}@#{config.host}:#{config.path}/.git master" }
+    local { run "git push #{config.user}@#{config.host}:#{config.path}/.git #{config.local_branch}:#{config.remote_branch}" }
   end
 
   private
@@ -100,4 +105,12 @@ module Gitploy
       @run_queue = []
       cmd
     end
-end
+
+    def current_branch
+      if branch = `git symbolic-ref HEAD`
+        branch.chomp.gsub('refs/heads/', '')
+      else
+        'master'
+      end
+    end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitploy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brent Dillingham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -04:00
+date: 2010-09-29 00:00:00 -04:00
 default_executable: gitploy
 dependencies: []