mercure 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe33e4a602bc5082651c757ff546c775063fac02
-  data.tar.gz: eb7d2fe3dca15f73197194561feb458da78ea45b
+  metadata.gz: 00bfb25b6832250ab5a1b8f5233574fca200e404
+  data.tar.gz: 4ad55e297ff2e568be4eb87dd9bc59ef99ead58b
 SHA512:
-  metadata.gz: 404758e49d06e46b2466c0a95c1482823284763b872c788ff0e5aa8604e1d3ef5e5442805b02d3d78b644bd8820f8d2aa59b0513b805e253372b914dcfbc69ad
-  data.tar.gz: 0ef9a8cdea0f9b3a0decb891b4d3af87063f3ca17632993bf9f381e688e5bc0cc8703ddafecb593bf78c58bc68a5116e18bbaf61d43f27a6e68c928c6295ca2e
+  metadata.gz: e39deac709acdef5e439f112c00743c3a5738b285f1bd8c529906a1f81c645a5de2792db34eca2b2017d8d8915ef6910548d11d650542991c0b348aebe0a5d76
+  data.tar.gz: 222b0999d810280d963eba4766e8f2c875b9dd6756a4ec616e73db80ff3a702c446a445502981ff0989874f100d837d27fbded06f3b15f137a54b3adcc01634e

data/lib/mercure.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'plist'
 
 require 'mercure/deploy'
+require 'mercure/changelog'
 
 module Mercure
 
@@ -58,6 +59,13 @@ 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
+    
   end
   
 end

data/lib/mercure/changelog.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'plist'
+require 'parse-ruby-client'
+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"]
+
+    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/changelog.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+ 
+output="$3.markdown"
+html_output="$3"
+css_stylesheet="/tmp/mercure_changelog.css"
+gitlab_url="http://mobigitlab.pj.fr"
+ 
+pretty_format="| [%cr]($gitlab_url/commits/%h) | [%an]($gitlab_url/u/%cn) | %s |"
+pretty_format="| %cr | %an | (%h) | %s |"
+
+echo '<style type="text/css">' > $css_stylesheet
+echo 'body { line-height: 1.6em; color:#333333; font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; }' >> $css_stylesheet
+echo 'table { font-size: 12px; margin: 45px; text-align: left; border-collapse: collapse; }' >> $css_stylesheet
+echo 'table th { font-size: 14px; font-weight: normal; padding: 10px 8px; color: #039; }' >> $css_stylesheet
+echo 'table td { padding: 8px; color: #669; }' >> $css_stylesheet
+echo 'table .odd { background: #e8edff; }' >> $css_stylesheet
+echo '</style>' >> $css_stylesheet
+
+ 
+echo "# Changelog from $1 to $2" > $output
+echo "" >> $output
+ 
+echo "## Dev" >> $output
+echo "" >> $output
+echo "|---|---|---|---|" >> $output
+git log --pretty=format:$pretty_format --abbrev-commit --date=relative $1..$2 | grep -i -v -e "mantis" -e "fix" -e "merge" -e "pod" | sed 's/Dev/dev/'  >> $output
+ 
+echo "" >> $output
+ 
+echo "## Mantis" >> $output
+echo "" >> $output
+echo "|---|---|---|---|" >> $output
+git log --pretty=format:$pretty_format --abbrev-commit --date=relative $1..$2 | grep -i "mantis" | grep -v -i -e "merge"   >> $output
+echo "" >> $output
+ 
+echo "## Pods" >> $output
+echo "" >> $output
+echo "|---|---|---|---|" >> $output
+git log --pretty=format:$pretty_format --abbrev-commit --date=relative $1..$2 | grep -i "pod" | grep -v -i -e "merge"   >> $output
+echo "" >> $output
+ 
+pandoc -H $css_stylesheet -s $output -o $html_output

data/lib/mercure/deploy.rb

@@ -15,6 +15,7 @@ require_relative 'parse.rb'
 require_relative 'paths.rb'
 require_relative 'git.rb'
 require_relative 'upload.rb'
+require_relative 'changelog.rb'
 
 # 
 # Build
@@ -224,8 +225,9 @@ end
 
 
 def buildArtefacts (xcode_settings)
-  generateIpa   xcode_settings
-  generatePlist xcode_settings
+  generateIpa         xcode_settings
+  generatePlist       xcode_settings
+  generateChangelog   xcode_settings
 end
 
 # def unlock_keychain

data/lib/mercure/git.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'highline/import'
 
 def checkOutGitVersion (settings)
   

data/lib/mercure/parse.rb

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

data/lib/mercure/paths.rb

@@ -155,6 +155,53 @@ def remoteDsymPath (settings , destination)
   
 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 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/upload.rb

@@ -12,11 +12,9 @@ require_relative 'paths.rb'
 
 def uploadArtefacts(settings)
   
-  uploadPlist(settings)
-  uploadIPA(settings)
-
-  # legacy, shouldn't be needed when the old DTAppStore will no more be used.
-  updateDTMobXML settings
+  uploadPlist       settings
+  uploadIPA         settings
+  uploadChangelog   settings
   
 end
 
@@ -73,6 +71,21 @@ 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
+
 # files_to_upload is an array of arrays
 # that must be like [local_file_path , remote_file_path]
 def uploadViaSSH(host , login , path, files_to_upload)
@@ -161,58 +174,3 @@ def uploadViaFTP(host, usermame , password , path, files_to_upload)
   
 end
 
-
-def updateDTMobXML (settings)
-  
-  # après upload des artefacts, on peut mettre à jour le fichier dtmob.xml
-  # et pourquoi pas dsem.xml
-  
-  puts "Pas de mise à jour du dtmob.xml pour le moment"
-  
-  return
-  
-  host        = settings[:deploy]["uploadServer"]["ipa"][0]["host"]
-  login       = settings[:deploy]["uploadServer"]["ipa"][0]["login"]
-  path        = settings[:deploy]["uploadServer"]["ipa"][0]["path"]
-  buildNumber = settings[:buildNumber]
-  
-  dtmobApplicationName    = settings[:deploy]["uploadServer"]["ipa"][0]["applicationTitle"]
-  dtmobApplicationVersion = settings[:deploy]["uploadServer"]["ipa"][0]["applicationVersion"]
-  
-  Net::SCP.start(host, login) do |scp|
-    puts 'Mise-à-jour du fichier dtmob.xml'
-    scp.download!(remoteDTMobFile, localDTMobFile)
-    
-    file  = File.read(localDTMobFile)
-    dtmob = Nokogiri::XML(file)
-    
-    timeFormat        = "%Y-%m-%d %H-%M-%S"
-    lastUpdate        = DateTime.now.strftime(timeFormat)
-    applicationXPath  = "//application[title='#{dtmobApplicationName}']"
-    versionXPath      = "version[numero='#{dtmobApplicationVersion}']"
-    changeLogXPath    = "changelog"
-    changeLogContent  = <<-EOXML
-    <![CDATA[
-    <ul>
-    <li>Last update: #{lastUpdate}</li>
-    <li>Build number: #{buildNumber}</li>
-    </ul>]]>
-    EOXML
-    
-    application       = dtmob.xpath(applicationXPath)
-    version           = application.xpath(versionXPath)
-    
-    changeLog            = version.xpath(changeLogXPath).first
-    changeLog.inner_html = changeLogContent
-    
-    # save the output into a new file
-    File.open(localDTMobFile, "w") do |f|
-      f.write dtmob.to_xml
-    end
-    
-    
-    scp.upload(localDTMobFile , remoteDTMobFile)
-  end
-  
-end
-

data/lib/mercure/version.rb

@@ -1,3 +1,3 @@
 module Mercure
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end

data/mercure.gemspec

@@ -21,8 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "bundler"
+  
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-mocks'
+  spec.add_development_dependency 'simplecov'
+  
+  spec.add_runtime_dependency 'bundler'
   spec.add_runtime_dependency "rake"
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'plist'

data/spec/mercure_helper.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Mercure do
+  
+  it "should build an IPA" do
+    pending "write it"
+  end
+  
+  it "should upload an IPA" do
+    pending "write it"
+  end
+  
+  it "should deploy an IPA" do
+    pending "write it"
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'bundler/setup'
+Bundler.setup
+
+require 'mercure' # and any other gems you need
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercure
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Meuel
@@ -10,6 +10,48 @@ bindir: bin
 cert_chain: []
 date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: rspec-mocks
+  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: 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
@@ -151,6 +193,8 @@ files:
 - bin/mercure
 - lib/mercure.rb
 - lib/mercure/build.rb
+- lib/mercure/changelog.rb
+- lib/mercure/changelog.sh
 - lib/mercure/deploy.rb
 - lib/mercure/git.rb
 - lib/mercure/ipa.rb
@@ -162,6 +206,8 @@ files:
 - lib/mercure/upload.rb
 - lib/mercure/version.rb
 - mercure.gemspec
+- spec/mercure_helper.rb
+- spec/spec_helper.rb
 homepage: https://github.com/teriiehina/mercure
 licenses:
 - MIT
@@ -186,4 +232,6 @@ rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Build and distribute iOS app
-test_files: []
+test_files:
+- spec/mercure_helper.rb
+- spec/spec_helper.rb