joomla-rake 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c17264cb8d33e9657d64daac7c64038140bddca
-  data.tar.gz: 7b7ca05bbdfd67ac6d0fdfd6fb7a76d9fe9e0e34
+  metadata.gz: 84231b7500328b13647e749d384a371e59d8f2fc
+  data.tar.gz: dda52f5ce8b4f063f1d093559364a41c8a742f6d
 SHA512:
-  metadata.gz: 497fdf539e45a1800148b6fb12f2755118ff72b6ce44418a64637aa325d4fe30c404243a319d9c30bf35033a59cc1a5ad2d4b598a13f560ab98a82f24867dd31
-  data.tar.gz: f0933aed76939444d9ccc24e8a381a55f067c2466229d06d2b28ef6325e214db298573e86bab3a276d628f43852f770ed6f9dd4cfa369c2edd6b222a33e72f0f
+  metadata.gz: a43a9c525f6354c1dc6374c592ede6a64d6c5feb1d41c9550602de566243685be8ecb8e57f26209614b735363375390e328b620be9ea52e6a6d9ba5a8911cbab
+  data.tar.gz: 34a749fc7a9705f831e2d1aa5a28231d1fd7c037e33d2cac3bd451cd9dcce009ff3bda0da4d2a2433c540e01da036bd893802dc349cae41ef3096c56f90309d9

data/lib/helpers/helpers.rb

@@ -4,14 +4,9 @@ require 'rugged'
 require 'builder'
 require 'logger'
 
-#
 # Load Configuration from package.yaml
-#
 $package = YAML.load_file("./package.yml")
 
-# Logging
-$logger  = Logger.new(STDOUT)
-$logger.level = Logger::INFO
 
 Rake.application.options.quiet = true if ENV['LOUD_RAKE'].nil?
 
@@ -22,7 +17,11 @@ Rake.application.options.quiet = true if ENV['LOUD_RAKE'].nil?
 #
 # @return [String] Verison Name
 def version_name
-  $package['package']['version'].to_s + '.' + commit_count
+  version = $package['package']['version'].to_s + '.' + commit_count
+
+  ENV['JR_PACKAGE_VERSION'] ||= version
+  
+  version
 end
 
 ##
@@ -40,7 +39,7 @@ end
 #
 # @return [String] Package Name
 def package_name
-  "pkg_#{$package['name']}-#{version_name}"
+  "pkg_#{$package['name']}-#{version_name}#{package_tag}"
 end
 
 
@@ -60,7 +59,7 @@ end
 
 # Get the build area path
 def build_area
-  "./packages/#{$package['name']}-#{version_name}"
+  "./packages/#{$package['name']}-#{version_name}#{package_tag}"
 end
 
 # Replace template values
@@ -71,3 +70,22 @@ def template( template, values )
   }
   output
 end
+
+
+def package_tag
+  branch = `git rev-parse --abbrev-ref HEAD`
+
+  return '' if branch == 'master'
+
+  '-' + branch.strip!
+end
+
+def update_site
+  $package['package']['test_update_site'] if package_tag
+  $package['package']['update_site']
+end
+
+def s3_bucket
+  $package['package']['test_bucket'] if package_tag
+  $package['package']['bucket']
+end

data/lib/helpers/manifest_generators.rb

@@ -11,10 +11,10 @@ def update_manifest
       u.type 'package'
       u.version version_name
       u.downloads do |d|
-        d.downloadurl({:type => "full" , :format => "zip"}, "#{$package['package']['update_site']}/#{package_name}.zip")
+        d.downloadurl({:type => "full" , :format => "zip"}, "#{update_site}/#{package_name}.zip")
       end
       u.tags do |t|
-        u.tag 'Stable'
+        u.tag package_tag || 'Stable'
       end
       u.infourl "http://www.mrzen.com/travelzen"
       u.maintainer 'MrZen Ltd'

data/lib/tasks/s3_upload.rb

@@ -20,7 +20,7 @@ task :upload => [:package] do
   require 'aws-sdk'
   
   s3 = AWS::S3.new(s3_credentials)
-  bucket = s3.buckets[$package['s3']['bucket']]
+  bucket = s3.buckets[s3_bucket]
 
   package_files = [ 
            File.join( $package['s3']['path'] , package_name + '.zip'),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joomla-rake
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Leo Adamek
@@ -114,7 +114,6 @@ files:
 - lib/tasks/plugins.rb
 - lib/tasks/s3_upload.rb
 - lib/tasks/templates.rb
-- lib/tasks/versioning.rb
 homepage: http://mrzen.com
 licenses:
 - GPL2+

data/lib/tasks/versioning.rb

@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-def next_version(current_version)
-  # Semantic Versioning Bump
-  v = current_version.split '.'
-  
-  # Increase PATCH version
-  v[-1] = v[-1].to_i + 1
-
-  v.join '.'
-  
-end
-
-def bump_version
-  
-  version_file = File.read("./package.yml")
-  old_version_line = version_file[/^\s{2}version:\s*[\d\.]+$/]
-  new_version = next_version($package['package']['version'])
-  
-  version_file.sub!( old_version_line , "  version: #{new_version}")
-  File.write("./package.yml", version_file)
-
-  new_version
-end
-
-desc "Increase the version number by 1 PATCH"
-task :bump do |t|
-  puts "Version upgrade: #{version_name} → #{bump_version}"
-end