joe_jenkins 1.0.3 → 1.0.6

data/lib/helpers/jj_xcode.rb

@@ -22,18 +22,6 @@ class JJXcode
     @projectDirectory = Dir.pwd
   end
   
-  def methods()
-    var = Array.new
-    var.push "getInstalledProfiles"
-    var.push "listProfiles"
-    var.push "getTargets"
-    var.push "doBuild"
-    var.push "reSignApp"
-    var.push "packageApp"
-    
-    var
-  end
-  
   def log(msg)
     JJDebugger.log(msg) if @verbose
   end
@@ -74,11 +62,17 @@ class JJXcode
   # Do an 'xcodebuild -configuration -xcconfig' with given params
   # @return The path to the .app file
 
-  def doBuild(configuration="Debug", config="")
-    if(config == "")
-      config = createXCConfig()
-    end
-    output = doXcodeCall("-configuration #{configuration}"+(config.length>0 ? " -xcconfig #{config}" : ""))
+  def doBuild(configuration="Debug", target="")
+    configuration = "Debug" if(configuration == nil)
+    target = "" if(target == nil)
+    config = createXCConfig()
+    
+    x_call = "-configuration #{configuration} "
+    x_call += "-target #{target} " if(target && target.length > 0)
+    x_call += "-xcconfig #{config}"
+    
+    
+    output = doXcodeCall(x_call)
     if(output.include?"BUILD SUCCEEDED")
       binaryLoc = binaryLocation(configuration)
       log "Build Output Here: #{binaryLoc}"
@@ -147,10 +141,10 @@ class JJXcode
       data += "CustomBundleID = #{@bundleIdentifier};\n"
       data += "GCC_PREPROCESSOR_DEFINITIONS = #{@macroFlags};\n"
       
-      xc_s = File.new("config.xcconfig", "w")
+      xc_s = File.new("#{@projectDirectory}/config.xcconfig", "w")
       xc_s.write(data)
       xc_s.close
-      return "config.xcconfig"
+      return "#{@projectDirectory}/config.xcconfig"
     end
     
     def getProjectInfo()

data/lib/joe_jenkins.rb

@@ -4,28 +4,36 @@ require 'helpers/jj_xcode'
 require 'zip/zip'
 require 'plist'
 require 'json'
-require 'rest_client'
+
 class JoeJenkins
   
   attr_accessor :config
+  attr_accessor :xcode
   
   def initialize(verbose=false)
     @xcode = JJXcode.new(verbose)
   end
   
-  def doBuildWithConfig(config)
+  def doBuildWithConfig(config, package=false)
     @config = config
     
     @xcode.profile = config[:profile]
     @xcode.signer = config[:signer]
     @xcode.bundleIdentifier = config[:bundleID]
-    
-    appOutputLocation = @xcode.doBuild(config[:configuration])
+    @xcode.macroFlags = config[:macros]
+    appOutputLocation = @xcode.doBuild(config[:configuration],config[:target])
     
     print "Write Config to #{@xcode.buildDir(@config[:configuration])+"/config.txt"}\n"
     File.open(@xcode.buildDir(@config[:configuration])+"/config.txt", "w") do |f|
       f.puts @config.to_json
     end
+    
+    if(package)
+      print "Packaging #{appOutputLocation}\n"
+      appOutputLocation = @xcode.packageApp(appOutputLocation, @xcode.profile, File.dirname(appOutputLocation))  
+      print "PACKAGED #{appOutputLocation}\n"
+    end
+    
     # print "This is the output #{appOutputLocation}\n"
     return appOutputLocation
   end
@@ -41,6 +49,15 @@ class JoeJenkins
     print "\nPost complete #{res.to_str}\n<br/>"
   end
   
+  def moveBuild(build_file, bc_file_path)
+    print "Moving Build #{build_file} => #{bc_file_path}\n"
+    FileUtils.mkdir_p bc_file_path
+    if(File.exists?bc_file_path)
+      FileUtils.cp(build_file, bc_file_path+"/#{build_file.split('/').last}")
+      
+    end
+  end
+  
   def createDistributionPlist
     
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Joseph Ridenour
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-03 00:00:00 -05:00
+date: 2012-12-31 00:00:00 -06:00
 default_executable: 
 dependencies: []