middleman-deploy-with-notifications 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb21ad698e22b91a8b1930291fe5d88f5fd5607
-  data.tar.gz: 1742203e9541ac3f9db5506b5e47687962ed511a
+  metadata.gz: a3e1ecf7ec07a01399eb4563426e637ec7afe669
+  data.tar.gz: 9638f7e4e69a433fe250208397a83c352b03406e
 SHA512:
-  metadata.gz: 68d7a9d039a590179b9bf0d81ff860f9ac171045efcf2fd9fa46ddfdb35b28a5816d304e05d086bcbb6d6391af5122661464d61c38d219422e4050469b54ad1c
-  data.tar.gz: aafc196453206172c4156284ccde8f95e0fdc97dd64c18cbeb4af05da421906ed62fb99f40a36dfa202f9a721934393e547661128f6cf40b7e098b12dd40de57
+  metadata.gz: 4b624214ae6beddfe061439704454af0f4dfb628e100712954906cbb74455961f9c82789b9941009025668e31812f1a11daafc0812690e8abeec1c52f3e4af49
+  data.tar.gz: 239a6bcffa54ded3ecb78db45ac517d7007faf3b160af3b27829f79b46688d3f91eca5aeb84022dbf15dd4f8c76d09e2e2a36bd259e27961261aad59b75c46ae

data/.gitignore

@@ -1,3 +1,3 @@
-Gemfile.lock
 coverage
 *.gem
+.bundle

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-deploy.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,96 @@
+PATH
+  remote: .
+  specs:
+    middleman-deploy-with-notifications (0.0.29)
+      airbrake
+      colorize
+      hipchat
+      middleman-core (>= 3.0.0)
+      ptools
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    airbrake (3.1.12)
+      activesupport
+      builder
+      json
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
+    builder (3.2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    colorize (0.5.8)
+    cucumber (1.2.5)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.7)
+      multi_json (~> 1.3)
+    diff-lcs (1.2.4)
+    ffi (1.8.1)
+    fivemat (1.2.1)
+    gherkin (2.11.8)
+      multi_json (~> 1.3)
+    hipchat (0.8.0)
+      httparty
+      httparty
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    i18n (0.6.1)
+    json (1.7.7)
+    listen (0.7.3)
+    middleman-core (3.0.13)
+      activesupport (~> 3.2.6)
+      bundler (~> 1.1)
+      listen (~> 0.7.3)
+      rack (~> 1.4.1)
+      rack-test (~> 0.6.1)
+      rb-fsevent (~> 0.9.3)
+      thor (~> 0.15.4)
+      tilt (~> 1.3.6)
+    multi_json (1.7.3)
+    multi_xml (0.5.3)
+    ptools (1.2.2)
+    rack (1.4.5)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.9.6)
+    rb-fsevent (0.9.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    thor (0.15.4)
+    tilt (1.3.7)
+    yard (0.8.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (~> 0.4.11)
+  cucumber (~> 1.2.0)
+  fivemat
+  middleman-deploy-with-notifications!
+  rake (~> 0.9.2)
+  rdoc (~> 3.9)
+  rspec (~> 2.7)
+  simplecov
+  yard (~> 0.8.0)

data/lib/middleman-deploy-with-notifications/commands.rb

@@ -32,6 +32,8 @@ module Middleman
       :aliases => "-c",
       :desc => "Remove orphaned files or directories on the remote host"
       def deploy
+        # build before deploys
+        Middleman::Cli::Build.new.build
         send("deploy_#{self.deploy_options.method}")
       end
 
@@ -105,16 +107,23 @@ EOF
         options
       end
 
+      def notify_airbrake(short_rev, rev, who)
+        puts "Recording a timestamped deploy in Airbrake: #{short_rev}".green
+        url = "api_key=#{self.deploy_options.airbrake_api_key}" +
+          "&deploy[rails_env]=production" +
+          "&deploy[local_username]=#{who}" +
+          "&deploy[scm_repository]=git@github.com:140proof/280.140proof.com.git" +
+          "&deploy[scm_revision]=#{short_rev}"
+        `curl -d "#{url}" http://airbrake.io/deploys &> /dev/null`
+      end
+
       def send_hc_mesg(mesg, fmt = "text")
         uri = uri || URI.parse( "http://api.hipchat.com/v1/rooms/message" )
-        hipchat_token = "66975dc754b5e7a0800e627708d61a"
-        hipchat_rooms = [26057,39979] # Engineering + BAP hc rooms
-
-        hipchat_rooms.each do |room|
+        self.deploy_options.hipchat_rooms.each do |room|
           Net::HTTP.post_form( uri, {
             "format"          => "json",
             "color"           => "random",
-            "auth_token"      => hipchat_token,
+            "auth_token"      => self.deploy_options.hipchat_token,
             "room_id"         => room,
             "from"            => "280 Deploy",
             "message"         => mesg,
@@ -149,18 +158,14 @@ EOF
         github_user, github_project = `git remote -v | grep "/" | head -n1`.gsub( /.*:([\w_-]+)\/([\w_\.-]+).git.*/, '\1/\2' ).split( "/" )
         github_project.chomp!
 
-        who     = `git config --get github.user`.chomp
-        rev     = `git rev-parse --short HEAD`.gsub( /\s*$/, '' ).chomp
-        branch  = `git rev-parse --abbrev-ref HEAD`.gsub( /\s*/, '' ).chomp
-        comment = `git log -1 --pretty=%B`.gsub( /\s*$/, '' ).chomp
-
-        if self.deploy_options.airbrake_api_key
-          puts "Recording a timestamped deploy in Airbrake: #{rev}".green
-          url = "api_key=#{airbrake_api_key}&deploy[rails_env]=production&deploy[local_username]=#{who}&deploy[scm_repository]=git://github.com/140proof/280.140proof.com&deploy[scm_revision]=#{rev}"
-          `curl -d "#{url}" http://airbrake.io/deploys &> /dev/null`
-        end
+        rev       = `git rev-parse HEAD`.gsub( /\s*$/, '' ).chomp
+        short_rev = `git rev-parse --short HEAD`.gsub( /\s*$/, '' ).chomp
+        branch    = `git rev-parse --abbrev-ref HEAD`.gsub( /\s*/, '' ).chomp
+        comment   = `git log -1 --pretty=%B`.gsub( /\s*$/, '' ).chomp
+        who       = `git config --get github.user`.chomp
 
-        hipchat_start(who, github_project)
+        notify_airbrake(short_rev, rev, who) if self.deploy_options.airbrake_api_key
+        hipchat_start(who, github_project) if self.deploy_options.hipchat_token
 
         puts "Deploying via rsync to #{user}@#{host}".red
 

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

@@ -1,6 +1,6 @@
 module Middleman
   module DeployWithNotifications
     PACKAGE = "middleman-deploy-with-notifications"
-    VERSION = "0.0.30"
+    VERSION = "0.0.31"
   end
 end

data/middleman-deploy-with-notifications.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = Middleman::DeployWithNotifications::PACKAGE
   s.version     = Middleman::DeployWithNotifications::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["John Manoogian III", "Tom Vaughan"]
-  s.email       = ["jm3+gems@140proof.com"]
+  s.authors     = ["Tom Vaughan", "John Manoogian III"]
+  s.email       = ["thomas.david.vaughan@gmail.com"]
   s.license     = "MIT"
   s.homepage    = "http://github.com/jm3/middleman-deploy/"
   s.summary     = %q{Deploy a middleman built site over rsync or via git (e.g. gh-pages on github).}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy-with-notifications
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
-- John Manoogian III
 - Tom Vaughan
+- John Manoogian III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -84,7 +84,7 @@ dependencies:
 description: Deploy a middleman-built site over rsync or via git with airbrake + hipchat
   notifications.
 email:
-- jm3+gems@140proof.com
+- thomas.david.vaughan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,6 +92,7 @@ files:
 - .gitignore
 - COPYING
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - THANKS