haml-edge 2.1.48 → 2.1.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.48
1
+ 2.1.49
data/Rakefile CHANGED
@@ -250,6 +250,12 @@ end
250
250
  # ----- Handling Updates -----
251
251
 
252
252
  task :handle_update do
253
+ unless ENV["REF"] =~ %r{^refs/heads/(master|(?:haml|sass)-pages)$}
254
+ puts "#{'=' * 20} Ignoring rake handle_update REF=#{ENV["REF"].inspect}"
255
+ next
256
+ end
257
+ branch = $1
258
+
253
259
  puts
254
260
  puts
255
261
  puts '=' * 150
@@ -260,11 +266,11 @@ task :handle_update do
260
266
  sh %{git reset --hard origin/master}
261
267
 
262
268
  begin
263
- if ENV["REF"] == "refs/heads/master"
269
+ if branch == "master"
264
270
  sh %{rake release_edge --trace}
265
271
  sh %{rake pages --trace PROJ=haml}
266
272
  sh %{rake pages --trace PROJ=sass}
267
- elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$}
273
+ elsif branch =~ /^(haml|sass)-pages$/
268
274
  sh %{rake pages --trace PROJ=#{$1}}
269
275
  end
270
276
  ensure
@@ -272,4 +278,7 @@ task :handle_update do
272
278
  sh %{git clean -xdf}
273
279
  sh %{git checkout master}
274
280
  end
281
+
282
+ puts 'Done running handle_update'
283
+ puts '=' * 150
275
284
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.48
1
+ 2.1.49
@@ -3,8 +3,11 @@ require 'sinatra'
3
3
  require 'json'
4
4
  set :port, 3123
5
5
  set :environment, :production
6
+ enable :lock
6
7
  Dir.chdir(File.dirname(__FILE__) + "/..")
7
8
 
8
9
  post "/" do
10
+ puts "Recieved payload!"
11
+ puts "Rev: #{`git name-rev HEAD`.strip}"
9
12
  system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
10
13
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml-edge
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.48
4
+ version: 2.1.49
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -46,8 +46,8 @@ extra_rdoc_files:
46
46
  - README.md
47
47
  - MIT-LICENSE
48
48
  - VERSION
49
- - REVISION
50
49
  - VERSION_NAME
50
+ - REVISION
51
51
  - EDGE_GEM_VERSION
52
52
  files:
53
53
  - rails/init.rb
@@ -250,8 +250,8 @@ files:
250
250
  - README.md
251
251
  - MIT-LICENSE
252
252
  - VERSION
253
- - REVISION
254
253
  - VERSION_NAME
254
+ - REVISION
255
255
  - EDGE_GEM_VERSION
256
256
  has_rdoc: true
257
257
  homepage: http://haml.hamptoncatlin.com/