billy_the_tool 0.2.3 → 0.2.4

data/README.md

@@ -4,8 +4,6 @@
 
 Billy is very simple deploy application built on top of [capistrano](https://github.com/capistrano/capistrano). This tool may be useful for designers and html programmers to simplify roll out process on staging server.
 
-Deploy model undermeans single staging server and deploying from `master` branch only.
-
 ## Install
 
 Billy distributes as [ruby gem](http://rubygems.org/gems/billy_the_tool), requires ruby 1.8.7+ and superuser privileges in case of global system installation (not [rvm](https://rvm.io/)).
@@ -23,7 +21,7 @@ If everything is ok this command will ask you to provide superuser password and
 
 `billy hello` will check all the system requirements and will give some helpful info. Billy will great you if all the requirements are satisfied And prompt to install otherwise.
 
-`billy eat {url_to_billy_config_or_local_file}` will parse config file with specified path and save it to current folder. `url_to_billy_config_or_local_file` could be local file path or remote file url. Spaeking of deploy process billy will check both current and home folders while looking for config file. Billy stores it's settings in file named `.billyrc`.
+`billy eat {url_to_billy_config_or_local_file}` will parse config file with specified path and save it to current folder. `url_to_billy_config_or_local_file` could be local file path or remote file url. During deploy process billy will check both current and home folders while looking for config file. Billy stores it's settings in file named `.billyrc`.
 
 ### Sample config file
 
@@ -42,10 +40,15 @@ billy my config
 This command will return config settings from current folder if there wis .billyrc file, home settings from ~/.billyrc otherwise.
 
 ### GIT dependency
+
 Billy hopes to find git repository inside your project with existing remote. You haven't say billy where your remote is. It checks for `.git/config` file and grabs all the remotes inside.
 
 After config file is set up and you have pushed all the changes you've done Billy is ready to deploy.
 
+#### Current branch instead of master since v0.2.4
+
+Version 0.2.4 brings new feature about git usage: not it'll get your current branch if no one is specified in config with `branch:` key.
+
 ## Usage
 
 Here I will show how to download remote config file to my local folder and then deploy some project_name to staging server:
@@ -73,4 +76,4 @@ This scheme requires deployer publick key to be placed on staging server and sta
 billy my key
 ```
 
-This command will return one of your ssh keys, id_rsa.pub by default
+This command will return one of your ssh keys, id_rsa.pub by default

data/lib/billy/util/scm/git.rb

@@ -9,9 +9,13 @@ module Billy
       def configure!( cap, config )
         cap.set :scm, :git
         cap.set :repository, config.repository || get_repository_path
-        cap.set :branch, config.branch || 'master'
+        cap.set :branch, config.branch || current_branch
       end
       
+      def current_branch
+        `git symbolic-ref HEAD 2> /dev/null`.strip.gsub(/^refs\/heads\//, '')
+      end
+
       def get_config
         File.read( File.expand_path( GIT_PATH + "/config" ) )
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: billy_the_tool
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - 4pcbr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-03 00:00:00 +04:00
+date: 2013-04-10 00:00:00 +04:00
 default_executable: billy
 dependencies: 
 - !ruby/object:Gem::Dependency