thrust 0.3.1 → 0.4.0

data/lib/thrust/tasks/focused_specs.rb

@@ -0,0 +1,17 @@
+module Thrust
+  module Tasks
+    class FocusedSpecs
+      FOCUSED_METHODS = %w[fit(@ fcontext(@ fdescribe(@]
+
+      def initialize(executor = Thrust::Executor.new)
+        @executor = executor
+      end
+
+      def run(thrust)
+        pattern = FOCUSED_METHODS.join("\\|")
+        directories = thrust.app_config.ios_spec_targets.values.map(&:target).join(' ')
+        @executor.system_or_exit %Q[grep -l -r -e "\\(#{pattern}\\)" #{directories} | grep -v 'Frameworks'; exit 0]
+      end
+    end
+  end
+end

data/lib/thrust/tasks/ios_specs.rb

@@ -0,0 +1,37 @@
+module Thrust
+  module Tasks
+    class IOSSpecs
+      def initialize(out = $stdout,
+                     xcode_tools_provider = Thrust::IOS::XCodeToolsProvider.new,
+                     cedar = Thrust::IOS::Cedar.new)
+        @xcode_tools_provider = xcode_tools_provider
+        @cedar = cedar
+        @out = out
+      end
+
+      def run(thrust, target_info, args)
+        build_configuration = target_info.build_configuration
+        type = target_info.type
+        target = target_info.target
+        scheme = target_info.scheme
+        build_sdk = target_info.build_sdk
+        runtime_sdk = args[:runtime_sdk] || target_info.runtime_sdk
+
+        tools_options = {
+          project_name: thrust.app_config.project_name,
+          workspace_name: thrust.app_config.workspace_name
+        }
+
+        xcode_tools = @xcode_tools_provider.instance(@out, build_configuration, thrust.build_dir, tools_options)
+        xcode_tools.build_scheme_or_target(scheme || target, build_sdk)
+
+        if type == 'app'
+          xcode_tools.kill_simulator
+          @cedar.run(build_configuration, target, runtime_sdk, build_sdk, target_info.device, target_info.device_type_id, thrust.build_dir, thrust.app_config.ios_sim_binary)
+        else
+          xcode_tools.test(target || scheme, build_configuration, runtime_sdk, thrust.build_dir)
+        end
+      end
+    end
+  end
+end

data/lib/thrust/tasks/nof.rb

@@ -0,0 +1,20 @@
+module Thrust
+  module Tasks
+    class Nof
+      FOCUSED_METHODS = %w[fit(@ fcontext(@ fdescribe(@]
+
+      def initialize(executor = Thrust::Executor.new)
+        @executor = executor
+      end
+
+      def run
+        substitutions = FOCUSED_METHODS.map do |method|
+          unfocused_method = method.sub(/^f/, '')
+          "-e 's/#{method}/#{unfocused_method}/g;'"
+        end
+
+        @executor.system_or_exit %Q[rake focused_specs | xargs -I filename sed -i '' #{substitutions.join(' ')} "filename"]
+      end
+    end
+  end
+end

data/lib/thrust/tasks/trim.rb

@@ -0,0 +1,24 @@
+module Thrust
+  module Tasks
+    class Trim
+      def initialize(executor = Thrust::Executor.new)
+        @executor = executor
+      end
+
+      def run
+        awk_statement = <<-AWK
+        {
+          if ($1 == "RM" || $1 == "R")
+            print $4;
+          else if ($1 != "D")
+            print $2;
+        }
+        AWK
+
+        awk_statement.gsub!(%r{\s+}, " ")
+
+        @executor.system_or_exit %Q[git status --porcelain | awk '#{awk_statement}' | grep -e '.*\.[cmh]$' | xargs sed -i '' -e 's/	/    /g;s/ *$//g;']
+      end
+    end
+  end
+end

data/lib/thrust/tasks.rb

@@ -1,3 +1,4 @@
-load File.expand_path("../../tasks/cedar.rake", __FILE__) unless File.exists?('AndroidManifest.xml')
-load File.expand_path("../../tasks/testflight.rake", __FILE__)
-load File.expand_path("../../tasks/version.rake", __FILE__)
+load File.expand_path('../../tasks/cedar.rake', __FILE__) unless File.exists?('AndroidManifest.xml')
+load File.expand_path('../../tasks/autotag.rake', __FILE__)
+load File.expand_path('../../tasks/testflight.rake', __FILE__)
+load File.expand_path('../../tasks/version.rake', __FILE__)

data/lib/thrust/testflight.rb

@@ -1,37 +1,38 @@
-class Thrust::Testflight
-  def initialize(thrust_executor, out, input, api_token, team_token)
-    @thrust_executor = thrust_executor
-    @out = out
-    @in = input
-    @git = Thrust::Git.new(@thrust_executor, @out)
-    @api_token = api_token
-    @team_token = team_token
-  end
-
-  def upload(package_file, notify, distribution_list, autogenerate_deploy_notes, deployment_target, dsym_path = nil)
-    if dsym_path
-      @out.puts 'Zipping dSYM...'
-      zipped_dsym_path = "#{dsym_path}.zip"
-      @thrust_executor.system_or_exit "zip -r -T -y '#{zipped_dsym_path}' '#{dsym_path}'"
-      @out.puts 'Done!'
+module Thrust
+  class Testflight
+    def initialize(thrust_executor, out, input, api_token, team_token)
+      @thrust_executor = thrust_executor
+      @out = out
+      @in = input
+      @git = Thrust::Git.new(@out, @thrust_executor)
+      @api_token = api_token
+      @team_token = team_token
     end
 
-    if autogenerate_deploy_notes
-      message_file_path = @git.generate_notes_for_deployment(deployment_target)
-    else
-      message_file_path = Thrust::UserPrompt.get_user_input('Deploy Notes: ', @out, @in)
-    end
+    def upload(package_file, notify, distribution_list, autogenerate_deploy_notes, deployment_target, dsym_path = nil)
+      if dsym_path
+        @out.puts 'Zipping dSYM...'
+        zipped_dsym_path = "#{dsym_path}.zip"
+        @thrust_executor.system_or_exit "zip -r -T -y '#{zipped_dsym_path}' '#{dsym_path}'"
+        @out.puts 'Done!'
+      end
 
+      if autogenerate_deploy_notes
+        message_file_path = @git.generate_notes_for_deployment(deployment_target)
+      else
+        message_file_path = Thrust::UserPrompt.get_user_input('Deploy Notes: ', @out, @in)
+      end
 
-    @thrust_executor.system_or_exit [
-                                      'curl http://testflightapp.com/api/builds.json',
-                                      "-F file=@#{package_file}",
-                                      ("-F dsym=@#{zipped_dsym_path}" if dsym_path),
-                                      "-F api_token='#{@api_token}'",
-                                      "-F team_token='#{@team_token}'",
-                                      "-F notes=@#{message_file_path}",
-                                      "-F notify=#{(ENV['NOTIFY'] || notify).to_s.downcase.capitalize}",
-                                      ("-F distribution_lists='#{distribution_list}'" if distribution_list)
-                                    ].compact.join(' ')
+      @thrust_executor.system_or_exit [
+        'curl http://testflightapp.com/api/builds.json',
+        "-F file=@#{package_file}",
+        ("-F dsym=@#{zipped_dsym_path}" if dsym_path),
+        "-F api_token='#{(ENV['TESTFLIGHT_API_TOKEN'] || @api_token)}'",
+        "-F team_token='#{@team_token}'",
+        "-F notes=@#{message_file_path}",
+        "-F notify=#{(ENV['NOTIFY'] || notify).to_s.downcase.capitalize}",
+        ("-F distribution_lists='#{distribution_list}'" if distribution_list)
+      ].compact.join(' ')
+    end
   end
 end

data/lib/thrust/testflight_credentials.rb

@@ -0,0 +1,11 @@
+module Thrust
+  class TestflightCredentials
+    attr_reader :api_token,
+                :team_token
+
+    def initialize(attributes)
+      @api_token = attributes['api_token']
+      @team_token = attributes['team_token']
+    end
+  end
+end

data/lib/thrust/user_prompt.rb

@@ -1,12 +1,14 @@
 require 'colorize'
 
-module Thrust::UserPrompt
-  def self.get_user_input(prompt, out, stdin = $stdin)
-    out.print prompt.yellow
-    message = stdin.gets
-    message_file = Tempfile.new('message')
-    message_file << message
-    message_file.close
-    message_file.path
+module Thrust
+  class UserPrompt
+    def self.get_user_input(prompt, fout, fin)
+      fout.print(prompt.yellow)
+      message = fin.gets
+      message_file = Tempfile.new('message')
+      message_file << message
+      message_file.close
+      message_file.path
+    end
   end
-end
+end

data/lib/thrust.rb

@@ -1,9 +1,6 @@
-module Thrust; end
-module Thrust::Android; end
-module Thrust::IOS; end
-
 require 'thrust/config'
 require 'thrust/executor'
+require 'thrust/execution_helper'
 require 'thrust/git'
 require 'thrust/testflight'
 require 'thrust/user_prompt'
@@ -18,3 +15,11 @@ require 'thrust/ios/deploy'
 require 'thrust/ios/deploy_provider'
 require 'thrust/ios/x_code_tools'
 require 'thrust/ios/x_code_tools_provider'
+
+require 'thrust/tasks/autotag/create'
+require 'thrust/tasks/autotag/list'
+require 'thrust/tasks/clean'
+require 'thrust/tasks/focused_specs'
+require 'thrust/tasks/ios_specs'
+require 'thrust/tasks/nof'
+require 'thrust/tasks/trim'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrust
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Aaron Levine
@@ -9,9 +9,11 @@ authors:
 - Andrew Bruce
 - Andrew Kitchen
 - Brandon Liu
-- Can Berk Güder
+- Brian Butz
+- Can Berk Guder
 - Eugenia Dellapenna
 - Jeff Hui
+- Joe Masilotti
 - Johnathon Britz
 - Jonathan Barnes
 - Michael McCormick
@@ -30,86 +32,86 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: auto_tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 description: Thrust provides a collection of rake tasks for iOS and Android projects.  These
   include tasks for running Cedar test suites (iOS) and for deploying apps to Testflight
   (iOS and Android).
@@ -122,6 +124,7 @@ files:
 - bin/thrust
 - lib/config/android_example.yml
 - lib/config/ios_example.yml
+- lib/tasks/autotag.rake
 - lib/tasks/cedar.rake
 - lib/tasks/testflight.rake
 - lib/tasks/version.rake
@@ -129,7 +132,10 @@ files:
 - lib/thrust/android/deploy.rb
 - lib/thrust/android/deploy_provider.rb
 - lib/thrust/android/tools.rb
+- lib/thrust/app_config.rb
 - lib/thrust/config.rb
+- lib/thrust/deployment_target.rb
+- lib/thrust/execution_helper.rb
 - lib/thrust/executor.rb
 - lib/thrust/git.rb
 - lib/thrust/ios/agv_tool.rb
@@ -138,8 +144,17 @@ files:
 - lib/thrust/ios/deploy_provider.rb
 - lib/thrust/ios/x_code_tools.rb
 - lib/thrust/ios/x_code_tools_provider.rb
+- lib/thrust/ios_spec_target.rb
 - lib/thrust/tasks.rb
+- lib/thrust/tasks/autotag/create.rb
+- lib/thrust/tasks/autotag/list.rb
+- lib/thrust/tasks/clean.rb
+- lib/thrust/tasks/focused_specs.rb
+- lib/thrust/tasks/ios_specs.rb
+- lib/thrust/tasks/nof.rb
+- lib/thrust/tasks/trim.rb
 - lib/thrust/testflight.rb
+- lib/thrust/testflight_credentials.rb
 - lib/thrust/user_prompt.rb
 homepage: http://github.com/pivotal/thrust
 licenses:
@@ -151,12 +166,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []