fwtoolkit 0.7.3 → 0.8.0

data/lib/fwtoolkit.rb

@@ -5,4 +5,4 @@ require 'core_data'
 require 'fwtoolkit/version'
 require 'fwtoolkit/test/frank_model'
 
-Dir["tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
+Dir["tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)

data/lib/fwtoolkit/tasks/build.rb

@@ -5,6 +5,7 @@ require 'cucumber/rake/task'
 require 'core_data'
 require 'erb'
 require 'xcodeproj'
+require 'fwtoolkit/tasks/helper'
 
 module XcodeBuild
   def self.run(args = "", output_buffer = STDOUT)
@@ -38,7 +39,7 @@ module FWToolkit
             
       attr_accessor :workspace
       attr_accessor :scheme
-      attr_accessor :bundle_identifier
+      attr_accessor :project      
       attr_accessor :certificate
       attr_accessor :provisioning_profile
 
@@ -66,31 +67,41 @@ module FWToolkit
             t.sdk = "iphoneos"
             t.workspace = @workspace
             t.scheme = @scheme
-            t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+            #t.formatter = XcodeBuild::Formatters::ProgressFormatter.new
+            t.output_to = FWToolkit::Tasks.cc_artifacts_dir
           end
           
-          desc 'Build IPA file'
           task :ipa do
-            command = "xcrun -sdk 'iphoneos' PackageApplication -v '/tmp/artifacts/Applications/#{scheme}.app' -o '/tmp/artifacts/Applications/#{scheme}.ipa' --sign '#{certificate}' --embed '#{provisioning_profile}'"
-            sh command
+            configuration = 'Release'
+            
+            # update the project file to use the correct cert/provisioning
+            signature_settings = {
+              "CODE_SIGN_IDENTITY"=> self.certificate, 
+              "PROVISIONING_PROFILE"=> self.provisioning_profile
+            }
+            p = Xcodeproj::Project.new self.project
+            p.targets[0].build_settings(configuration).merge!(signature_settings)
+            p.save_as self.project
+            
+            artifacts_dir = FWToolkit::Tasks.cc_artifacts_dir
+  
+            sh %{bundle exec ipa build -s #{self.scheme} -c #{configuration} --clean}
           end
           
           task :validate_auth_token do
-            unless ENV['FWBUILD_AUTH_TOKEN']
-              abort 'Please set FWBUILD_AUTH_TOKEN environment variable'
+            unless ENV['HOCKEY_APP_TOKEN']
+              abort 'Please set HOCKEY_APP_TOKEN environment variable in ~/.bashrc (HOCKEY_APP_TOKEN=<your token>; export HOCKEY_APP_TOKEN)'
             end
           end
           
           task :upload do 
-            auth_token = ENV['FWBUILD_AUTH_TOKEN']            
-            file_name = "#{scheme}.ipa"
-            key = File.join('uploads', file_name)
-            sh("curl -X POST -F 'key=#{key}' -F 'acl=bucket-owner-full-control' -F 'file=@/tmp/artifacts/Applications/#{scheme}.ipa' https://fw.fwbuild.production.s3.amazonaws.com/ --progress-bar")
-            sh("curl -X POST -d 'bundle_identifier=#{@bundle_identifier}&s3_upload_name=#{file_name}&auth_token=#{auth_token}&build[version]=#{DateTime.now.to_s}' http://fwbuild.futureworkshops.com/apps/builds.json")
+            token = ENV['HOCKEY_APP_TOKEN']            
+            artifacts_dir = FWToolkit::Tasks.cc_artifacts_dir
+            sh %{bundle exec ipa distribute:hockeyapp --token #{token} -m ""}
           end
           
           desc 'Build and Upload IPA'
-          task :build_upload => [:validate_auth_token, 'release_iphoneos:archive', :ipa, :upload]
+          task :build_upload => [:validate_auth_token, :ipa, :upload]
         end
         
         namespace :frank do
@@ -99,18 +110,6 @@ module FWToolkit
             sh "frank build --workspace #{@workspace} --scheme #{@scheme}"
           end
         end
-        
-        namespace :fwbuild do
-          task :upload do
-            S3Cmd.put("path/to/a/file.ext", "s3://fw.fwbuild.production/uploads/") do |progress|
-              puts progress
-            end
-          end
-          
-          task :build_upload => ["xcode:release_device:clean", "xcode:release_device:archive", "upload"]
-        end
-        
-
       end
   
     end

data/lib/fwtoolkit/tasks/frank.rb

@@ -1,3 +1,5 @@
+require 'fwtoolkit/tasks/helper'
+
 module FWToolkit
   module Tasks
     class Frank < Thor
@@ -46,7 +48,7 @@ module FWToolkit
             Cucumber::Rake::Task.new(:ci_test, 'Run Frank acceptance tests with CI options') do |t|
               ENV['APP_BUNDLE_PATH'] = File.join( Dir.pwd, 'Frank/frankified_build/Frankified.app' )
               ENV['USE_SIM_LAUNCHER_SERVER'] = 'YES'
-              artifacts_dir = ENV['CC_BUILD_ARTIFACTS'] ? ENV['CC_BUILD_ARTIFACTS'] : '/tmp'
+              artifacts_dir = FWToolkit::Tasks.cc_artifacts_dir
               t.cucumber_opts = "Frank/features --tags ~@wip --format pretty --format html --out '#{artifacts_dir}/frank_results.html' --format rerun --out '#{artifacts_dir}/frank_rerun.txt'"
             end
 

data/lib/fwtoolkit/tasks/helper.rb

@@ -0,0 +1,7 @@
+module FWToolkit
+  module Tasks
+    def self.cc_artifacts_dir
+      ENV['CC_BUILD_ARTIFACTS'] ? ENV['CC_BUILD_ARTIFACTS'] : File.join(Dir.pwd, 'artifacts')
+    end
+  end
+end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -251,6 +251,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.10
+- !ruby/object:Gem::Dependency
+  name: shenzhen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: A collection of iOS development tools used by Future Workshops
 email:
 - matt@futureworkshops.com
@@ -267,6 +283,7 @@ files:
 - lib/fwtoolkit/tasks/ci.rb
 - lib/fwtoolkit/tasks/cocoapods.rb
 - lib/fwtoolkit/tasks/frank.rb
+- lib/fwtoolkit/tasks/helper.rb
 - lib/fwtoolkit/tasks/services.rb
 - lib/fwtoolkit/test/frank_model.rb
 - lib/fwtoolkit/test/misc_steps.rb
@@ -309,12 +326,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1249502825317644920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1249502825317644920
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25