mercure 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85cc795a9b1d7c44d3ae394f9cab03c92c37c0b
-  data.tar.gz: d3eb4e46091076619a7be52340218b8a31074e02
+  metadata.gz: 217b225bb7c48c73a284fe4da316bb2366544218
+  data.tar.gz: 80d66f53bd9931c0e51c221f19286ac49aa4c1af
 SHA512:
-  metadata.gz: 7bba4528c9442b52fad452b1f161c7156fcb82893eb516a5dfb7cdc169be0a2d7dac51e8868c1ce016b6e260e720465819fffc38a40b43e700090d64e0897c4d
-  data.tar.gz: 2c8c507724f85c656cf148ccf79767e6cdb8854df439943c4e8153d5d0005f760c2911dfe21a3ce39ea6296cb617472c06ae8fda7383b0da122f33347a03fade
+  metadata.gz: b8224e1e71bc5c1ba79852259d5396654a302fd0305ade5147712f014fd160575f51066406681b68e9d378e396976d5af980d169ac784de66e96710c2be122e3
+  data.tar.gz: 4609dd0160f4cc6a6687d3dcf2282a478c6162e98df61248186537d5d8149a06fcc65893d61b94b8d28ddf496a51b7c28490be4bc0d0f6f7bef2de0d3c1fd031

data/lib/mercure.rb

@@ -7,7 +7,7 @@ require 'mercure/deploy'
 module Mercure
 
   class Mercure < Thor
-
+    
     desc "check", "will check if everything necessary for building easily is present"
     def check
       puts "checking. Missing tools will be installed, if possible."
@@ -15,23 +15,43 @@ module Mercure
     end
 
     desc "build JOB", "will build the job"
+    option :pinailleur, :type => :boolean
     def build(plist)
-      buildDeployments plist
+      if options[:pinailleur]
+        buildDeploymentsByAsking plist
+      else
+        buildDeployments plist
+      end
     end
     
     desc "upload JOB", "will upload the job (must have been 'build' before)"
+    option :pinailleur, :type => :boolean
     def upload(plist)
-      uploadDeployments plist
+      if options[:pinailleur]
+        uploadDeploymentsByAsking plist
+      else
+        uploadDeployments plist
+      end
     end
     
     desc "deploy JOB", "will deploy the job (must have been 'build' and 'upload' before)"
+    option :pinailleur, :type => :boolean
     def deploy(plist)      
-      deployDeployments plist
+      if options[:pinailleur]
+        deployDeploymentsByAsking plist
+      else
+        deployDeployments plist
+      end
     end
     
     desc "pan JOB", "will build, upload and deploy the job"
+    option :pinailleur, :type => :boolean
     def pan(plist)
-      panDeployments plist
+      if options[:pinailleur]
+        panDeploymentsByAsking plist
+      else
+        panDeployments plist
+      end
     end
     
   end

data/lib/mercure/build.rb

@@ -26,7 +26,7 @@ def buildApp (settings)
   build_command += " TARGET_BUILD_DIR=\"#{buildDirectory}\"/#{buildConfiguration}-iphoneos"
   build_command += " CONFIGURATION_BUILD_DIR=\"#{buildDirectory}\"/#{buildConfiguration}-iphoneos"
   build_command += " clean build"
-  build_command += " | tee \"#{buildDirectory}/xcodebuild.log\""
+  build_command += " | tee \"#{buildDirectory}/#{applicationName}.log\""
   build_command += " | xcpretty -c --report html"
   
   puts build_command
@@ -38,7 +38,7 @@ end
 
 def updateBuild (settings)
   
-  # updateIcon settings , settings[:deploy]
+  updateIcon settings
     
   projectInfosPath  = plistInAppPath(settings)
   

data/lib/mercure/deploy.rb

@@ -16,58 +16,154 @@ require_relative 'paths.rb'
 require_relative 'git.rb'
 require_relative 'upload.rb'
 
+# 
+# Build
+#
 
 def buildDeployments (plist)
   
   deployments = Plist::parse_xml(plist)      
   
+  deployments.each do |deploy|
+    buildDeploy deploy
+  end
+  
+end
+
+def buildDeploymentsByAsking (plist)
+  
+  deployments = Plist::parse_xml(plist)
+  
   deployments.each do |deploy|
     
-    puts "Chargement des variables"
     settings = load_settings deploy
     
-    # on s'assure d'être dans la bonne version du code
-    # si le Info.plist ne contient pas de valeur pour la clé
-    # :CFBundleVersion (ce qui serait un peu embetant)
-    # on taggue le commit courant
-    checkOutGitVersion settings
+    choose do |menu|
+      
+      versionText = " dans sa version #{settings[:CFBundleVersion]}" if not settings[:CFBundleVersion].nil?
+      menu.prompt = "Veux-tu builder #{settings[:applicationName]}#{versionText} ?"
+
+      menu.choice(:oui) do
+        say("Bon choix !")
+        buildDeploy deploy
+      end
+      
+      menu.choice(:non) { say("Dommage") }
+    end
 
-    puts "Création de l'.app"
-    buildApp settings
-    updateBuild settings
-    
-    puts "Création de l'.ipa et du .plist"
-    buildArtefacts settings
-  end
+  end  
+end
+
+
+def buildDeploy (deploy)
+  
+  puts "Chargement des variables"
+  settings = load_settings deploy
+  
+  # on s'assure d'être dans la bonne version du code
+  # si le Info.plist ne contient pas de valeur pour la clé
+  # :CFBundleVersion (ce qui serait un peu embetant)
+  # on taggue le commit courant
+  checkOutGitVersion settings
+
+  puts "Création de l'.app"
+  buildApp settings
+  updateBuild settings
+  
+  puts "Création de l'.ipa et du .plist"
+  buildArtefacts settings
   
 end
 
+
+# 
+# Upload
+#
+
+def uploadDeploymentsByAsking (plist)
+  
+  deployments = Plist::parse_xml(plist)
+  
+  deployments.each do |deploy|
+    
+    settings = load_settings deploy
+    
+    choose do |menu|
+      
+      versionText = " dans sa version #{settings[:CFBundleVersion]}" if not settings[:CFBundleVersion].nil?
+      menu.prompt = "Veux-tu uploader #{settings[:applicationName]}#{versionText} ?"
+
+      menu.choice(:oui) do
+        say("Bon choix !")
+        uploadDeployments deploy
+      end
+      
+      menu.choice(:non) { say("Dommage") }
+    end
+
+  end  
+end
+
 def uploadDeployments (plist)
   
   deployments = Plist::parse_xml(plist)      
   
   deployments.each do |deploy|
-    puts "Chargement des variables"
+    uploadDeploy deploy
+  end
+end
+
+
+def uploadDeploy (deploy)
+  puts "Chargement des variables"
+  settings = load_settings deploy
+  
+  puts "Téléversement de l'.ipa et du .plist"
+  uploadArtefacts settings
+end
+
+# 
+# Deploy
+#
+
+def deployDeploymentsByAsking (plist_path)
+  
+  plist_content = CFPropertyList::List.new(file: plist_path)
+  deployments   = CFPropertyList.native_types(plist_content.value)
+  
+  deployments.each do |deploy|
+    
     settings = load_settings deploy
     
-    puts "Téléversement de l'.ipa et du .plist"
-    uploadArtefacts settings
+    choose do |menu|
+      
+      versionText = " dans sa version #{settings[:CFBundleVersion]}" if not settings[:CFBundleVersion].nil?
+      menu.prompt = "Veux-tu déployer #{settings[:applicationName]}#{versionText} ?"
+
+      menu.choice(:oui) do
+        say("Bon choix !")
+        deployDeploy deploy
+      end
+      
+      menu.choice(:non) { say("Dommage") }
+    end
+    
   end
   
+  puts "sauvegardes des infos de parse"
+  plist_content.value = CFPropertyList.guess(deployments)
+  plist_content.save(plist_path , CFPropertyList::List::FORMAT_XML)
+  
 end
 
+
 def deployDeployments (plist_path)
   
   plist_content = CFPropertyList::List.new(file: plist_path)
   deployments   = CFPropertyList.native_types(plist_content.value)
   
   deployments.each do |deploy|
-    puts "Chargement des variables"
-    settings = load_settings deploy
-    
-    puts "Mise à jour de Parse"
-    objectId = updateParse settings
-    deploy["parse"]["objectId"] = objectId
+    deployDeploy deploy
   end
   
   puts "sauvegardes des infos de parse"
@@ -76,6 +172,23 @@ def deployDeployments (plist_path)
   
 end
 
+
+# I know, I know
+def deployDeploy (deploy)
+  
+  puts "Chargement des variables"
+  settings = load_settings deploy
+    
+  puts "Mise à jour de Parse"
+  objectId = updateParse settings
+  deploy["parse"]["objectId"] = objectId
+  
+end
+
+#
+# pan
+#
+
 def panDeployments (plist)
   
   deployments = Plist::parse_xml(plist)      
@@ -98,14 +211,12 @@ def panDeployments (plist)
     puts "Création de l'.ipa et du .plist"
     buildArtefacts settings
     
-    if should_upload
-      puts "Téléversement de l'.ipa et du .plist"
-      uploadArtefacts settings
+    puts "Téléversement de l'.ipa et du .plist"
+    uploadArtefacts settings
 
-      puts "Mise à jour de Parse"
-      updateParse settings
-    end
-    
+    puts "Mise à jour de Parse"
+    updateParse settings
+  
   end
   
 end

data/lib/mercure/git.rb

@@ -1,12 +1,21 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'highline/import'
+
 def checkOutGitVersion (settings)
   
   tags            = `git tag`
   tag_name        = settings[:CFBundleVersion]
   current_commit  = settings[:gitSHA1]
   
+  # choose do |menu|
+  #   menu.prompt = "Would you like to create a tag for this build ?  "
+  #
+  #   menu.choice(:yes) { say("Good choice!") }
+  #   menu.choice(:no) { say("Too bad") }
+  # end
+  
   if tags.include?("#{tag_name}\n") == false
     puts "Le tag #{tag_name} n'existe pas."
     puts "Nous allons le créer pour pointer vers le commit actuel (#{current_commit})"
@@ -15,7 +24,6 @@ def checkOutGitVersion (settings)
   end
   
   puts "On checkout le tag #{tag_name}"
-  co_tag = `git checkout #{tag_name}`
 end
 
 def tagGit (settings)

data/lib/mercure/ipa.rb

@@ -23,6 +23,8 @@ def generateIpa settings
   signingIdentity     = settings[:signingIdentity]
   provisioningProfile = settings[:provisioningProfile]
   
+  system("rm -f \"#{dsymPath}\"")
+  
   puts "Construction de l'IPA"
   
   signingCommand =  "/usr/bin/xcrun -sdk iphoneos PackageApplication"

data/lib/mercure/update_icon.rb

@@ -11,13 +11,13 @@ require_relative 'paths.rb'
 def updateIcon (settings)
 
   iconsBasePath = "#{settings[:projectDirectory]}/PagesJaunes/Data/Images/SPLASH+ICONE"
-  icons = [["icone_base.png" , "icone.png"] , ["icone_base@2x.png" , "icone@2x.png"]]
+  icons = [["Icon_base.png" , "Icon.png"] , ["Icon_base@2x.png" , "Icon@2x.png"]]
   
   should_update_icon = settings[:deploy]["icon"]["addExtraInfosInIcon"]
   
-  # if !should_update_icon
-  #   return
-  # end
+  if !should_update_icon
+    return
+  end
   
   basePath = appPath(settings)
 
@@ -40,12 +40,10 @@ def addInfosToIcon (settings , source_file , dest_file)
   projectInfosPath  = settings[:projectInfosPath]
   projectInfos      = Plist::parse_xml(projectInfosPath)
 
-  version       = projectInfos["CFBundleVersion"]
-  commit        = `git rev-parse --short HEAD`.strip
-  branch        = `git rev-parse --abbrev-ref HEAD`.strip
-  
-  width    = `identify -format %w #{source_file}`
-  
+  version = projectInfos["CFBundleVersion"]
+  commit  = `git rev-parse --short HEAD`.strip
+  branch  = `git rev-parse --abbrev-ref HEAD`.strip
+  width   = `identify -format %w #{source_file}`
   caption = iconCaptionForDeploy settings[:deploy]
 
   command  = "convert -background '#0008'"

data/lib/mercure/version.rb

@@ -1,3 +1,3 @@
 module Mercure
-  VERSION = "0.0.10"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercure
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - Peter Meuel