mina-flowdock 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b182d653465271aaf7e6ab1c5ab4dd61146d8a
-  data.tar.gz: b6c0583f4580f765df222dcca135378ebf6b0f46
+  metadata.gz: dec8135ceee4e7cf2e7fcaaf3fbba8a945da7ab0
+  data.tar.gz: 798b52b64e4c63e3e630ebf188f001cda2dbd9da
 SHA512:
-  metadata.gz: 8de3c513cd91b36876c75a18e5a73d3d8f0b3f25e1df15d0cc665f59311adc67e2d6214bb98dd776f02fb8361c9a7f2b44608ce8bbd7ae27747778bc7383dba0
-  data.tar.gz: 4edd364f8605efa8255914d6ce979e8d56836ce4bbf479e7818e9631c42e86f8c7a48266d89d0035568ce4d73b51af1e26890deff210fd8ea139cde011c63302
+  metadata.gz: 92eab0d16e70f71460d8345e365fb4cd3249e6ce6e981ca1192a42b4931955757a73a1bd86f3d4198bc87f161a78f94dc71ef6d90b610f039803fd5176cd60b2
+  data.tar.gz: 04f11372898dcc9067007a5bd8385038775b272177b5c9805d7fbc82ccd11fe1f4b215a069264f85950a66b5554f42b8faad42ebc1c65b0057d5f4cc802363e9

data/ChangeLog.md

@@ -1,4 +1,8 @@
-### 0.2 (unreleased)
+### 0.3 (unreleased)
+
+### 0.2 / 2013-12-02
+
+* Remove dependency on Grit (c extension) in favor of Ruby/Git (pure Ruby)
 
 ### 0.1 / 2013-12-02
 

data/README.md

@@ -40,7 +40,7 @@ The notifications are not sent if mina is run with the `--simulate` option.
 
 ### Uses git for user name and email
 
-The `grit` library is used to access the git config for the local repository
+The `Ruby/Git` library is used to access the git config for the local repository
 and send the notification from the user configured there.
 
 ### Configurable settings
@@ -72,7 +72,7 @@ set :flowdock_api_token, ["firstflowapitoken", "secondflowapitoken"]
 set :flowdock_deploy_env, stage
 
 # optional settings
-set :flowdock_deploy_tags, ["my_tag1", "my_tag2]
+set :flowdock_deploy_tags, ["my_tag1", "my_tag2"]
 ```
 
 Then run `mina deploy ...` as usual. Requiring `mina/flowdock` extends the
@@ -175,7 +175,7 @@ The git sha retrieved from the server after deployment. Uses the
 ## Requirements
 
   * [flowdock](https://github.com/flowdock/flowdock-api/)
-  * [grit](https://github.com/mojombo/grit)
+  * [git](https://github.com/schacon/ruby-git)
   * [mina](https://github.com/nadarei/mina)
   * [mina-hooks](https://github.com/elskwid/mina-hooks)
 

data/lib/mina/flowdock/notify.rb

@@ -2,8 +2,8 @@
 
 set_default :flowdock_deploy_tags,  []
 set_default :flowdock_source,       "Mina deployment"
-set_default :flowdock_from_name,    git_config["user.name"]
-set_default :flowdock_from_address, git_config["user.email"]
+set_default :flowdock_from_name,    git_user_name
+set_default :flowdock_from_address, git_user_email
 
 
 set_default :flowdock_message_subject,

data/lib/mina/flowdock/plugin.rb

@@ -1,4 +1,4 @@
-%w(flowdock grit mina/hooks).each do |lib|
+%w(flowdock git mina/hooks).each do |lib|
   begin
     require lib
   rescue LoadError => e
@@ -19,8 +19,16 @@ module Mina
         erb_string(settings.send :flowdock_message)
       end
 
+      def git_user_name
+        git_config["user.name"]
+      end
+
+      def git_user_email
+        git_config["user.email"]
+      end
+
       def git_config
-        Grit::Config.new(Grit::Repo.new("."))
+        Git.open(".").config
       end
 
       def erb_string(string, b = binding)
@@ -33,8 +41,9 @@ module Mina
         flow = "flow: #{flow.api_token} [#{flow.project}]"
         subj = "subject: #{flowdock_message_subject}"
         msg  = "message: #{flowdock_message}"
+        from = "from: #{git_user_name} <#{git_user_email}>"
 
-        [flow, subj, msg].each do |debug|
+        [flow, subj, msg, from].each do |debug|
             print_local_debug(debug)
         end
       end

data/lib/mina/flowdock/version.rb

@@ -1,6 +1,6 @@
 module Mina
   module Flowdock
     # mina-flowdock version
-    VERSION = "0.1"
+    VERSION = "0.2"
   end
 end

data/mina-flowdock.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "flowdock", "~> 0.3"
-  gem.add_dependency "grit", "~> 2.5"
+  gem.add_dependency "git", "~> 1.2"
   gem.add_dependency "mina-hooks", "~> 0.2"
 
   gem.add_development_dependency "bundler", "~> 1.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-flowdock
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Don Morrison
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mina-hooks
   requirement: !ruby/object:Gem::Requirement