middleman-deploy 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f7a8dcc337bf2c7b6e6d058135dbe42a0858838
-  data.tar.gz: 7943c508b8d0afc9e653f3a953796e77867c2ed0
+  metadata.gz: a43c05f5d3c90b6607a3d389cebeb028b0f9d38a
+  data.tar.gz: 19c4bfead327113f69ae24f7547bc3f61bfd968a
 SHA512:
-  metadata.gz: 0da41a24664305c55608def5db06c7bb296d909c1a9d2bfeeb43142d4cd4150752ceaaaea8b39bc3bf1c2fd92bd58712507c405b7cd10169497df2695cd2dcc5
-  data.tar.gz: fa7800a9cc0e4d4d1e104d0e0289cb8e3d326a9a42e322afc26796a5e5805eca8d0068156c7c91f4d7aeaa992836404c04d6fa3c233cad9442bfbd99779abd86
+  metadata.gz: 932dc17f6510dfe8f88535a87e1ee34b0d383571a85a46b78d5fa80a8029843d5a5082530edde252f5d79600dccdd21b9c0f3dffb27bab25204e640bea96fda6
+  data.tar.gz: 6fcb2a5c9a6c323453dda468a758c937f08c58f78ed00edeefab8ffc7eb58cdbf7d8649bfd3081e555baa79b24bb204abf09942e9a81f5947ffa369d30adbc67

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+master
+===
+
+1.0.0
+===
+
+* Respect user details of git repo. #70
+* Prevent bad commits deploying. (git) #77

data/README.md

@@ -5,7 +5,7 @@ Deploy your [Middleman](http://middlemanapp.com/) build via **rsync**, **ftp**,
 ## Installation
 
 ```ruby
-gem 'middleman-deploy', '~> 3.0'
+gem 'middleman-deploy', '~> 1.0'
 ```
 
 ## Usage
@@ -146,20 +146,10 @@ namespace :deploy do
 end
 ```
 
-    $ rake deploy:staging
-    $ rake deploy:production
-
-## Breaking Changes
-
-* `v0.1.0`
-    - Removed the `--clean` command-line option. This option only applied to
-      the rsync deploy method. The idea going forward is that command-line
-      options must apply to all deploy methods. Options that are specific to a
-      deploy method will only be available in `config.rb`.
-    - Removed `deploy` from the `after_build` hook. This caused a `deploy` to
-      be run each time `build` was called. This workflow never made
-      sense. `deploy` was added to the `after_build` hook simply because it
-      was available.
+```
+$ rake deploy:staging
+$ rake deploy:production
+```
 
 ## Badges
 
@@ -180,12 +170,10 @@ implementations:
 - [JRuby][jruby]
 - [Rubinius][rubinius]
 
-## Thanks!
-
-A **BIG** thanks to [everyone who has contributed](https://github.com/tvaughan/middleman-deploy/graphs/contributors)! Almost all pull requests are accepted.
-
 # Credits
 
+A **BIG** thanks to [everyone who has contributed](https://github.com/karlfreeman/middleman-deploy/graphs/contributors)! Almost all pull requests are accepted.
+
 Inspiration:
 
 - The rsync task in [Octopress](https://github.com/imathis/octopress)

data/Rakefile

@@ -17,7 +17,7 @@ end
 begin
   require 'rubocop/rake_task'
   desc 'Run rubocop'
-  Rubocop::RakeTask.new(:rubocop)
+  RuboCop::RakeTask.new(:rubocop)
 rescue LoadError
 end
 

data/lib/middleman-deploy/pkg-info.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Deploy
     PACKAGE = 'middleman-deploy'
-    VERSION = '0.3.0'
+    VERSION = '1.0.0'
     TAGLINE = 'Deploy a middleman built site over rsync, ftp, sftp, or git (e.g. gh-pages on github).'
     README = %Q{
 You should follow one of the four examples below to setup the deploy
@@ -61,4 +61,4 @@ activate :deploy do |deploy|
   deploy.password = "secret"
 end}
   end
-end
+end

data/lib/middleman-deploy/strategies/git/base.rb

@@ -3,13 +3,15 @@ module Middleman
     module Strategies
       module Git
         class Base
-          attr_accessor :branch, :build_dir, :remote, :commit_message
+          attr_accessor :branch, :build_dir, :remote, :commit_message, :user_name, :user_email
 
           def initialize(build_dir, remote, branch, commit_message)
             self.branch         = branch
             self.build_dir      = build_dir
             self.remote         = remote
             self.commit_message = commit_message
+            self.user_name      = `git config --get user.name`
+            self.user_email     = `git config --get user.email`
           end
 
           def process
@@ -37,9 +39,14 @@ module Middleman
           def commit_branch(options = '')
             message = self.commit_message ? self.commit_message : add_signature_to_commit_message('Automated commit')
 
-            `git add -A`
-            `git commit --allow-empty -am "#{message}"`
-            `git push #{options} origin #{self.branch}`
+            run_or_fail("git add -A")
+            run_or_fail("git commit --allow-empty -am \"#{message}\"")
+            run_or_fail("git push #{options} origin #{self.branch}")
+          end
+
+          private
+          def run_or_fail(command)
+            system(command) || raise("ERROR running: #{command}")
           end
         end
       end

data/lib/middleman-deploy/strategies/git/force_push.rb

@@ -19,12 +19,18 @@ module Middleman
             unless File.exist?('.git')
               `git init`
               `git remote add origin #{url}`
+              `git config user.name "#{self.user_name}"`
+              `git config user.name "#{self.user_email}"`
             else
               # check if the remote repo has changed
               unless url == `git config --get remote.origin.url`.chop
                 `git remote rm origin`
                 `git remote add origin #{url}`
               end
+              # check if the user name has changed
+              `git config user.name "#{self.user_name}"` unless self.user_name == `git config --get user.name`
+              # check if the user email has changed
+              `git config user.email "#{self.user_email}"` unless self.user_email == `git config --get user.email`
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom Vaughan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -151,6 +151,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md