mercure 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4f122febfd18aa0440e5420ff98cbc691e98f8
-  data.tar.gz: bedbf5c4fed43af951be5b19f05762b606ea8290
+  metadata.gz: c12678fd71e25fed2ff31a2a56d85aa86f4bd38b
+  data.tar.gz: 2b5cfd2f9d83cf652b60337d03a31468aacf860e
 SHA512:
-  metadata.gz: 07b530e01c9b6764440082933dfcb8899ac1c78b00caf9415d8210bb3951c49d95f5aa5bbd7310e323a18601ca2a8982c21cbe0fa219245ea6b490cc9d2aed71
-  data.tar.gz: 5ca844fcfbedf17936abf88b45a25631a7300d0c731721bf0633823171e5c2e974682c23de61847daf122627523298dd725412aa3e4d13742acd2760d1661dcf
+  metadata.gz: 1041e270dc534d2812ed9966c4190314384395a08089fe3295ce9cfaf76b1e55fe97cd29192efad27be486c0ed2a349b4f963683a49519364c19df2a07a27e48
+  data.tar.gz: bb5bbf9c83e8ba75d30cbe73b4ec659f8ff4251a1c775e0cb1a83ecae6ef35a580919ed94c04cd4e2c98e30d17356bbf9840dc0f035acb533c5dd00f1c61b79f

data/lib/mercure.rb

@@ -59,12 +59,12 @@ module Mercure
       end
     end
     
-    # desc "changelog JOB", "will build, upload and deploy the job"
-    # option :p, :type => :boolean
-    # option :pinailleur, :type => :boolean
-    # def changelog(plist)
-    #   generateChangelogs plist
-    # end
+    desc "changelog JOB", "will build, upload and deploy the job"
+    option :p, :type => :boolean
+    option :pinailleur, :type => :boolean
+    def changelog(plist)
+      generateChangelogs plist
+    end
     
   end
   

data/lib/mercure/changelog.rb

@@ -7,36 +7,33 @@ require 'cfpropertylist'
 
 require_relative 'paths.rb'
 
-# def generateChangelogs (plist_path)
-#
-#   plist_content = CFPropertyList::List.new(file: plist_path)
-#   deployments   = CFPropertyList.native_types(plist_content.value)
-#
-#   deployments.each do |deploy|
-#
-#     generateChangelog deploy
-#
-#   end
-#
-# end
-
-
-# def generateChangelog (deploy)
-#
-#     settings      = load_settings deploy
-#     changelogPath = changelogPath(settings)
-#     previousTag   = settings[:deploy]["build"]["previousGitTag"]
-#     currentTag    = settings[:deploy]["build"]["currentGitTag"]
-#
-#     if previousTag.nil? || currentTag.nil?
-#       return
-#
-#     name        = 'mercure'
-#     g           = Gem::Specification.find_by_name( name )
-#     script_path = File.join( g.full_gem_path, 'lib/mercure/changelog.sh' )
-#
-#     puts "#{script_path} #{previousTag} #{currentTag} #{changelogPath}"
-#
-#     system("#{script_path} #{previousTag} #{currentTag} #{changelogPath}")
-#
-# end
+def generateChangelogs (plist_path)
+  
+  plist_content = CFPropertyList::List.new(file: plist_path)
+  deployments   = CFPropertyList.native_types(plist_content.value)
+  
+  deployments.each do |deploy|
+    
+    generateChangelog deploy
+    
+  end
+
+end
+
+
+def generateChangelog (deploy)
+      
+    settings      = load_settings deploy
+    changelogPath = changelogPath(settings)
+    previousTag   = settings[:deploy]["build"]["previousGitTag"]
+    currentTag    = settings[:deploy]["build"]["currentGitTag"]
+
+    name        = 'mercure'
+    g           = Gem::Specification.find_by_name( name )
+    script_path = File.join( g.full_gem_path, 'lib/mercure/changelog.sh' )
+
+    puts "#{script_path} #{previousTag} #{currentTag} #{changelogPath}"
+
+    system("#{script_path} #{previousTag} #{currentTag} #{changelogPath}")
+    
+end

data/lib/mercure/deploy.rb

@@ -227,7 +227,9 @@ end
 def buildArtefacts (xcode_settings)
   generateIpa         xcode_settings
   generatePlist       xcode_settings
-#  generateChangelog   xcode_settings
+
+  # the following line has been commented in order to make it work on Xcode 7
+  #  generateChangelog   xcode_settings
 end
 
 # def unlock_keychain

data/lib/mercure/parse.rb

@@ -29,7 +29,7 @@ def updateParse (settings)
   appVersion["versionChangeLog"] = parseInfos["versionChangeLog"]
   appVersion["versionLevel"]     = parseInfos["versionLevel"].to_i
   appVersion["versionUrl"]       = publicPlistURL settings
- #appVersion["changelogUrl"]     = publicChangelogURL settings
+  appVersion["changelogUrl"]     = publicChangelogURL settings
 
   result = appVersion.save
   

data/lib/mercure/paths.rb

@@ -159,48 +159,48 @@ end
 # IPA
 #
 
-# def changelogName (settings)
-#
-#   buildDirectory      = settings[:buildDirectory]
-#   buildConfiguration  = settings[:buildConfiguration]
-#   buildNumber         = settings[:buildNumber]
-#   applicationName     = settings[:applicationName]
-#
-#   pjServerConf        = settings[:deploy]["infosPlist"]["PJServerConf"]
-#
-#   "changelog.#{applicationName}.#{buildNumber}.html"
-#
-# end
+def changelogName (settings)
 
-# def changelogPath (settings)
-#
-#   buildDirectory      = settings[:buildDirectory]
-#   buildConfiguration  = settings[:buildConfiguration]
-#   buildNumber         = settings[:buildNumber]
-#   applicationName     = settings[:applicationName]
-#   changelogName       = changelogName(settings)
-#
-#   "#{buildDirectory}/#{buildConfiguration}-iphoneos/#{changelogName}"
-#
-# end
+  buildDirectory      = settings[:buildDirectory]
+  buildConfiguration  = settings[:buildConfiguration]
+  buildNumber         = settings[:buildNumber]
+  applicationName     = settings[:applicationName]
+  
+  pjServerConf        = settings[:deploy]["infosPlist"]["PJServerConf"]
 
-# def remoteChangelogPath (settings , destination)
-#
-#   changelogName       = changelogName(settings)
-#   remotePath          = destination["path"]
-#
-#   "#{remotePath}/#{changelogName}"
-#
-# end
+  "changelog.#{applicationName}.#{buildNumber}.html"
+    
+end
 
-# def publicChangelogURL (settings)
-#
-#   publicURL     = settings[:deploy]["uploadServer"]["plist"][0]["publicURL"]
-#   changelogName = changelogName (settings)
-#
-#   "#{publicURL}/#{changelogName}"
-#
-# end
+def changelogPath (settings)
+  
+  buildDirectory      = settings[:buildDirectory]
+  buildConfiguration  = settings[:buildConfiguration]
+  buildNumber         = settings[:buildNumber]
+  applicationName     = settings[:applicationName]
+  changelogName       = changelogName(settings)
+  
+  "#{buildDirectory}/#{buildConfiguration}-iphoneos/#{changelogName}"
+  
+end
+
+def remoteChangelogPath (settings , destination)
+
+  changelogName       = changelogName(settings)
+  remotePath          = destination["path"]
+  
+  "#{remotePath}/#{changelogName}"
+  
+end
+
+def publicChangelogURL (settings)
+  
+  publicURL     = settings[:deploy]["uploadServer"]["plist"][0]["publicURL"]  
+  changelogName = changelogName (settings)
+  
+  "#{publicURL}/#{changelogName}"
+  
+end
 
 #
 # Extra

data/lib/mercure/plist.rb

@@ -9,7 +9,7 @@ require_relative 'paths.rb'
 
 def generatePlist (settings)
   
-  puts "Creation du plist"
+  puts "--> Creation du plist"
   
   buildConfiguration  = settings[:buildConfiguration]
   buildDirectory      = settings[:buildDirectory]
@@ -23,22 +23,24 @@ def generatePlist (settings)
   items       = Array.new
   item        = Hash.new
   
+  assets        = Array.new
   
-  assets      = Array.new
-  asset       = Hash.new
+  asset         = Hash.new
   asset['kind'] = 'software-package'
-  
   asset['url']  = settings[:deploy]["uploadServer"]["ipa"][0]["publicURL"] + "/" + ipaName(settings)
 
   assets.push asset
   
-  metadata    = Hash.new
-  metadata['bundle-identifier'] = settings[:deploy]["infosPlist"]["CFBundleIdentifier"] + ".iOS8"
+  metadata = Hash.new
+  
+  # the following line has been commented and replaced by th next one in order to make it work on iOS 9...
+  # metadata['bundle-identifier'] = settings[:deploy]["infosPlist"]["CFBundleIdentifier"] + ".iOS8"
+  metadata['bundle-identifier'] = settings[:deploy]["infosPlist"]["CFBundleIdentifier"]
   metadata['bundle-version']    = projectInfos['CFBundleVersion']
   metadata['subtitle']          = 'by SoLocal'
   metadata['title']             = settings[:deploy]["infosPlist"]["CFBundleDisplayName"]
   metadata['kind']              = 'software'
-  
+
   item['assets']    = assets
   item['metadata']  = metadata
   

data/lib/mercure/upload.rb

@@ -71,20 +71,20 @@ def uploadPlist(settings)
   
 end
 
-# def uploadChangelog(settings)
-#
-#   settings[:deploy]["uploadServer"]["plist"].each do |destination|
-#
-#     changelogPath         = changelogPath       (settings)
-#     remoteChangelogPath   = remoteChangelogPath (settings , destination)
-#
-#     files_to_upload = [[changelogPath , remoteChangelogPath]]
-#
-#     uploadFiles(settings , destination , files_to_upload)
-#
-#   end
-#
-# end
+def uploadChangelog(settings)
+  
+  settings[:deploy]["uploadServer"]["plist"].each do |destination|
+    
+    changelogPath         = changelogPath       (settings)
+    remoteChangelogPath   = remoteChangelogPath (settings , destination)
+    
+    files_to_upload = [[changelogPath , remoteChangelogPath]]
+    
+    uploadFiles(settings , destination , files_to_upload)
+    
+  end
+  
+end
 
 # files_to_upload is an array of arrays
 # that must be like [local_file_path , remote_file_path]

data/lib/mercure/version.rb

@@ -1,3 +1,3 @@
 module Mercure
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/mercure.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/teriiehina/mercure'
   spec.license     = 'MIT'
   
-  spec.date        = '2014-03-06'
+  spec.date        = '2015-11-23'
   spec.summary     = "Build and distribute iOS app"
   spec.description = "A tool that works only with plist files"
   spec.authors     = ["Peter Meuel"]
@@ -22,17 +22,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-mocks'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'rspec-mocks', '~> 3.3'
+  spec.add_development_dependency 'simplecov', '~> 0'
   
-  spec.add_runtime_dependency 'bundler'
-  spec.add_runtime_dependency "rake"
-  spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'plist'
-  spec.add_runtime_dependency 'net-scp'
-  spec.add_runtime_dependency 'parse-ruby-client'
-  spec.add_runtime_dependency 'nokogiri'
-  spec.add_runtime_dependency 'CFPropertyList'
-  spec.add_runtime_dependency 'xcpretty'
+  spec.add_runtime_dependency 'bundler', '~> 1.10'
+  spec.add_runtime_dependency "rake", '~> 0'
+  spec.add_runtime_dependency 'thor', '~> 0'
+  spec.add_runtime_dependency 'plist', '~> 3.1'
+  spec.add_runtime_dependency 'net-scp', '~> 1.2'
+  spec.add_runtime_dependency 'parse-ruby-client', '~> 0'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6'
+  spec.add_runtime_dependency 'CFPropertyList', '~> 2.3'
+  spec.add_runtime_dependency 'xcpretty', '~> 0.1'
 end

metadata

@@ -1,183 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: mercure
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Peter Meuel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: parse-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: xcpretty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 description: A tool that works only with plist files
 email: peter@teriiehina.net
 executables:
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Build and distribute iOS app