cap-git-deploy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84f6cead345d88b05a62d142c6bb180693dce4c5
-  data.tar.gz: b51288a0154302ea5d8489ad595060fc213c3981
+  metadata.gz: d6ea635853d315bab5683403f0b1a672017e9569
+  data.tar.gz: d0466392b528f2b509c91dd7b9c83dda7079f90d
 SHA512:
-  metadata.gz: 9b51504b5043029382cd39932b50d1dd59c4c9e44f17dc7907f77942f65b30e125097e6a5b46662406218029723e9aa77d24ae414e0d0f3a31614c75b18c25c3
-  data.tar.gz: 739693a098332d92fffd7ebdc8ed431e06b781ac28c68a60c5d58ee6820ede4e9d1cc75941356c1b6825c1569890f7fbb7b7437e670fbe672d263ddfe7b8dbbe
+  metadata.gz: 31ee25f5d4fd1914da809540716a5a275d687eecf903a3620a1d4ecc2a01aed7b060f24880602404fa5697047cb7e4ded02a69f0b5f5f095daddf822165c8348
+  data.tar.gz: e71b6c3232ad4ee342e5ae1cdca27bbcd4171713b779bcad16be5dc79dc300dc611e530cf8d7332d8170736f0b98615c85f3ca4a943172020433e01cf25fd900

data/cap-git-deploy.gemspec

@@ -19,7 +19,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'capistrano', '~> 2.0'
-  spec.add_runtime_dependency 'grit'
-
   spec.add_development_dependency 'rake'
 end

data/lib/cap-git-deploy.rb

@@ -1,7 +1,6 @@
 require 'capistrano'
 require 'cap-git-deploy/version'
 
-require 'grit'
 require 'etc'
 
 module Cap
@@ -11,15 +10,15 @@ module Cap
 
       # The name of the branch we are deploying
       def self.current_branch
-        repo = Grit::Repo.new '.'
-        branch = repo.head
-        # if branch is nil, we are in a spurius commit, then we should use master
-        branch && branch.name || 'master'
+        repo = `git rev-parse --abbrev-ref HEAD`.chomp
       end
 
       # The name of the current logged user
       def self.current_user
-        "#{Etc.getlogin}@#{Socket.gethostname}"
+        login = Etc.getlogin
+        user  = Etc.getpwnam(login)
+        host  = Socket.gethostname
+        "<#{user}> #{login}@#{host}"
       end
     end
   end

data/lib/cap-git-deploy/version.rb

@@ -1,7 +1,7 @@
 module Cap
   module Git
     module Deploy
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

data/lib/recipes/git-revisioning.rb

@@ -13,13 +13,14 @@ namespace :revision do
       sha = data.strip
     end
 
-    commands = []
-    commands << "cd #{current_path}"
-    commands << "echo '#{sha}' > #{revision_file}"
-    commands << "echo '#{branch}' >> #{revision_file}"
-    commands << "echo '#{logged_user}' >> #{revision_file}"
-    commands << "echo '#{Time.now}' >> #{revision_file}"
-    run commands.join ' && '
+    revision_contents = [
+      sha,
+      branch,
+      logged_user,
+      Time.now,
+    ].join("\n")
+
+    put revision_contents, "#{current_path}/#{revision_file}"
   end
 
   desc "Get info about last deploy"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-git-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicola Racco
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -25,20 +25,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: grit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement