ios_toolchain 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84794867ff43111e9f296a22f96c1ffca6f803b
-  data.tar.gz: 86b174307c5d06bd0dcd8c5a654f8c4afe244836
+  metadata.gz: 97f72a22613e5c4bcfe1a313980f51ca3daebf9c
+  data.tar.gz: d850802d0f51dc85fd2615e83797b919547ed2a4
 SHA512:
-  metadata.gz: 1b0018a4d9d996ed8fb0ab83acb00b82d78587638c783e06fdfa9daf2d25ee264c50c2090f98247a6c43580337aa1557075aa9a644158635520631a35ebae954
-  data.tar.gz: c559444b4c83e34448cfa0f31a8a9d7bc3c5ef14a312e4980d7c5a5c18bda438595999b40dd6ee48c3c31341433ac39a8942f10b52afce126e2a34a4e2143c43
+  metadata.gz: 4ce2d66b9f43486eea853abd3d2572e135bea580a8a2324d4c0f4aeb0054d80470e93bb1f79ff50a144a19575b60f0efb162be70f8cdb090d263148170910d60
+  data.tar.gz: 04a9c2f9689d93a241d101d554dcd384108a25138312ed7e06e6301febf2d0e505e70b083cc3cf1fd238838c8584fc73cde66ba48228cfa5474de07e74be16df

data/.gitignore

@@ -2,6 +2,8 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+.idea/
+
 ## Build generated
 build/
 DerivedData/

data/README.md

@@ -58,7 +58,7 @@ This is the full list of available tasks, as output by `rake -T`:
     rake ios:tidy:specs                               # Unfocusses any focussed Quick specs
     rake ios:tidy:whitespace                          # Removes trailing whitespace from code files
     rake shipit                                       # Checks that we're ready to push, and then pushes the current branch to origin
-    rake toolchain:bootstrap[project_path]            # Bootstraps iOS Toolchain configuration (project_path optional)
+    rake toolchain:bootstrap[project_root]            # Bootstraps iOS Toolchain configuration (project_root optional)
     rake validate                                     # Checks you if you need to do any cleanup of the code before you push
 
 ## Contributing

data/lib/ios_toolchain/config.rb

@@ -3,8 +3,12 @@ require 'bundler'
 
 module IosToolchain
   class Config
+    def project_root_path
+      Bundler.root.to_s
+    end
+
     def project_file_path
-      config_yaml['project-file-path']
+      absolute_path(config_yaml['project-file-path'])
     end
 
     def default_sdk
@@ -36,11 +40,11 @@ module IosToolchain
     end
 
     def provisioning_path
-      config_yaml['provisioning-path']
+      absolute_path(config_yaml['provisioning-path'])
     end
 
     def crashlytics_framework_path
-      config_yaml['crashlytics-framework-path']
+      absolute_path(config_yaml['crashlytics-framework-path'])
     end
 
     def crashlytics_installed?
@@ -53,8 +57,12 @@ module IosToolchain
 
   private
 
+    def absolute_path(path)
+      (Pathname.new(project_root_path) + Pathname.new(path)).to_s unless path.nil?
+    end
+
     def config_file_path
-      File.join(Bundler.root, file_name)
+      File.join(project_root_path, file_name)
     end
 
     def config_yaml

data/lib/ios_toolchain/config_bootstrapper.rb

@@ -25,7 +25,7 @@ module IosToolchain
 
     def config
       {
-        'project-file-path' => analyzer.project_path,
+        'project-file-path' => analyzer.project_file_path,
         'default-scheme' => analyzer.default_scheme,
         'default-sdk' => 'iphoneos10.2',
         'default-32bit-test-device' => "'iOS Simulator,OS=10.2,name=iPhone 5'",
@@ -33,7 +33,7 @@ module IosToolchain
         'app-targets' => analyzer.app_targets,
         'test-targets' => analyzer.test_targets,
         'ui-test-targets' => analyzer.ui_test_targets,
-        'provisioning-path' => "#{File.join(analyzer.project_root, 'provisioning')}",
+        'provisioning-path' => './provisioning',
         'crashlytics-framework-path' => analyzer.crashlytics_framework_path
       }
     end

data/lib/ios_toolchain/project_analyzer.rb

@@ -3,12 +3,15 @@ require 'pathname'
 
 module IosToolchain
   class ProjectAnalyzer
-    attr_reader :project_root, :project_path
+    attr_reader :project_root, :project_file_path
 
     def initialize(project_root)
-      @project_root = Pathname.new(project_root).realpath.to_s
-      @project_path = find_project_path!
-      @project = Xcodeproj::Project.open(@project_path)
+      project_root_path = Pathname.new(project_root).realpath
+      @project_root = project_root_path.to_s
+      @absolute_project_path = find_project_path!
+      @project_file_path = relative_from_root(@absolute_project_path)
+
+      @project = Xcodeproj::Project.open(@absolute_project_path)
     end
 
     def default_scheme
@@ -19,7 +22,8 @@ module IosToolchain
     end
 
     def crashlytics_framework_path
-      Dir.glob("#{project_root}/**/Crashlytics.framework").first
+      path = glob_excluding_carthage('**/Crashlytics.framework').first || return
+      relative_from_root(path)
     end
 
     def app_targets
@@ -42,24 +46,34 @@ module IosToolchain
 
     private
 
+    def relative_from_root(path)
+      "./#{Pathname(path).relative_path_from(Pathname.new(project_root)).to_s}"
+    end
+
     def shared_schemes
-      Xcodeproj::Project.schemes(project_path)
+      Xcodeproj::Project.schemes(project_file_path)
     end
 
     def project_name
-      project_path.split(File::SEPARATOR)[-1].split('.')[-2]
+      project_file_path.split(File::SEPARATOR)[-1].split('.')[-2]
     end
 
     def find_project_path!
-      Dir.glob(File.join(project_root, '/*.xcodeproj')).first.tap do |project|
+      glob_excluding_carthage('**/*.xcodeproj').first.tap do |project|
         return project unless project.nil?
 
         error_message  = "No .xcodeproj file was found in #{project_root} "
-        error_message += "Run `rake toolchain:bootstrap[/path/containing/project/]`"
+        error_message += 'Run `rake toolchain:bootstrap[/path/containing/project/]`'
         throw error_message
       end
     end
 
+    def glob_excluding_carthage(pattern)
+      Dir.glob(File.join(project_root, pattern)).reject do |name|
+        name =~ /\/Carthage\//
+      end
+    end
+
     attr_reader :project
   end
 end

data/lib/ios_toolchain/tasks/bootstrap.rake

@@ -6,11 +6,11 @@ include IosToolchain::Helpers
 
 desc 'iOS Toolchain maintenance tasks'
 namespace :toolchain do
-  desc "Bootstraps iOS Toolchain configuration (project_path optional)"
-  task :bootstrap, :project_path do |t, args|
-    args.with_defaults(:project_path => Bundler.root)
+  desc 'Bootstraps iOS Toolchain configuration (project_root optional)'
+  task :bootstrap, :project_root do |t, args|
+    args.with_defaults(:project_root => Bundler.root)
 
-    analyzer = IosToolchain::ProjectAnalyzer.new(args[:project_path])
+    analyzer = IosToolchain::ProjectAnalyzer.new(args[:project_root])
     bootstrapper = IosToolchain::ConfigBootstrapper.new(analyzer)
     bootstrapper.bootstrap!
 

data/lib/ios_toolchain/tasks/git.rake

@@ -1,18 +1,18 @@
 include IosToolchain::Helpers
 
 namespace :git do
-  desc "Checks for uncommitted changes and aborts if any are found"
+  desc 'Checks for uncommitted changes and aborts if any are found'
   task :check_for_uncommitted_changes do
-    puts "Checking for uncommitted changes..."
+    puts 'Checking for uncommitted changes...'
     if `git status -s`.chomp.length > 0
-      system("git status")
-      bail("Uncommitted changes detected (maybe something got auto-corrected?). Please commit these and try again.")
+      system('git status')
+      bail('Uncommitted changes detected (maybe something got auto-corrected?). Please commit these and try again.')
     end
-    puts "Done!"
+    puts 'Done!'
   end
 
-  desc "Pushes the current branch to origin"
+  desc 'Pushes the current branch to origin'
   task :push_origin do
-    system("git push origin head") || bail
+    system('git push origin head') || bail
   end
 end

data/lib/ios_toolchain/tasks/ios/clean.rake

@@ -4,28 +4,28 @@ namespace :ios do
   desc 'Cleans the build & resets simulator'
   task :clean => [:'clean:build']
 
-  desc "Cleans the build"
+  desc 'Cleans the build'
   namespace :clean do
     task :build do
-      puts "Cleaning..."
+      puts 'Cleaning...'
 
       clean_cmd = []
       clean_cmd << 'xcodebuild clean'
       clean_cmd << 'rm -rf build'
       system(clean_cmd.join("\n"))
 
-      puts "Done!"
+      puts 'Done!'
     end
 
     desc 'Resets the simulator'
     task :simulator do
-      puts "Resetting simulator..."
+      puts 'Resetting simulator...'
 
       system("osascript -e 'tell application \"iOS Simulator\" to quit'") &&
       system("osascript -e 'tell application \"Simulator\" to quit'") &&
-      system("xcrun simctl erase all")
+      system('xcrun simctl erase all')
 
-      puts "Done!"
+      puts 'Done!'
     end
   end
 end

data/lib/ios_toolchain/tasks/ios/dependencies.rake

@@ -1,25 +1,25 @@
 namespace :ios do
   namespace :carthage do
-    desc "updates our Carthage dependencies to the latest version"
+    desc 'updates our Carthage dependencies to the latest version'
     task :update do
       carthage_cmd = []
-      carthage_cmd << "carthage"
-      carthage_cmd << "update"
-      carthage_cmd << "--platform ios"
-      carthage_cmd << "--no-use-binaries"
-      carthage_cmd = carthage_cmd.join(" ")
+      carthage_cmd << 'carthage'
+      carthage_cmd << 'update'
+      carthage_cmd << '--platform ios'
+      carthage_cmd << '--no-use-binaries'
+      carthage_cmd = carthage_cmd.join(' ')
 
       system(carthage_cmd)
     end
 
-    desc "Fetches our Carthage dependencies to the locked in versions"
+    desc 'Fetches our Carthage dependencies to the locked in versions'
     task :fetch do
       carthage_cmd = []
-      carthage_cmd << "carthage"
-      carthage_cmd << "bootstrap"
-      carthage_cmd << "--platform ios"
-      carthage_cmd << "--no-use-binaries"
-      carthage_cmd = carthage_cmd.join(" ")
+      carthage_cmd << 'carthage'
+      carthage_cmd << 'bootstrap'
+      carthage_cmd << '--platform ios'
+      carthage_cmd << '--no-use-binaries'
+      carthage_cmd = carthage_cmd.join(' ')
 
       system(carthage_cmd)
     end

data/lib/ios_toolchain/tasks/ios/provisioning.rake

@@ -1,5 +1,5 @@
 include IosToolchain::Helpers
-require "fileutils"
+require 'fileutils'
 
 namespace :ios do
 	desc 'helpers for dealing with provisiong'

data/lib/ios_toolchain/tasks/ios/specs.rake

@@ -11,7 +11,7 @@ def build_specs_cmd(scheme, options={})
   specs_cmd << "-destination platform=#{config.default_32bit_test_device}" unless options[:skip_32bit]
   specs_cmd << "-destination platform=#{config.default_64bit_test_device}"
   specs_cmd << '| bundle exec xcpretty'
-  specs_cmd = specs_cmd.join(" ")
+  specs_cmd.join(' ')
 end
 
 def run_tests_or_bail(tests, args)
@@ -20,28 +20,28 @@ def run_tests_or_bail(tests, args)
   Rake::Task['ios:clean:build'].reenable
   Rake::Task['ios:clean:simulator'].reenable
   tests.each do |target|
-    if(!system(build_specs_cmd(target, skip_32bit: args[:skip_32bit])))
-      bail("Specs failure - please fix the failing specs and try again.")
+    unless system(build_specs_cmd(target, skip_32bit: args[:skip_32bit]))
+      bail('Specs failure - please fix the failing specs and try again.')
     end
   end
 end
 
 namespace :ios do
-  desc "Run all the tests: unit and UI, 32bit and 64bit"
+  desc 'Run all the tests: unit and UI, 32bit and 64bit'
   task :specs => ['specs:unit', 'specs:ui']
 
   namespace :specs do
-    desc "Run 64bit unit tests only"
+    desc 'Run 64bit unit tests only'
     task :slim do
       Rake::Task['specs:unit'].invoke(skip_32bit: true)
     end
 
-    desc "Run the unit tests (optionally skip 32 bit devices)"
+    desc 'Run the unit tests (optionally skip 32 bit devices)'
     task :unit, [:skip_32bit] => ['ios:clean:build', 'ios:clean:simulator'] do |task, args|
       run_tests_or_bail(config.test_targets, args)
     end
 
-    desc "Run the UI tests (optionally skip 32 bit devices)"
+    desc 'Run the UI tests (optionally skip 32 bit devices)'
     task :ui, [:skip_32bit] => ['ios:clean:build', 'ios:clean:simulator'] do |task, args|
       run_tests_or_bail(config.ui_test_targets, args)
     end

data/lib/ios_toolchain/tasks/ios/tidy.rake

@@ -3,13 +3,13 @@ require 'ios_toolchain/helpers'
 include IosToolchain::Helpers
 
 namespace :ios do
-  desc "Reports and attempts to tidy up common cleanliness problems with the codebase"
+  desc 'Reports and attempts to tidy up common cleanliness problems with the codebase'
   task :tidy => ['tidy:project_file', 'tidy:specs', 'tidy:whitespace', 'tidy:lint']
 
   namespace :tidy do
-    desc "Unfocusses any focussed Quick specs"
+    desc 'Unfocusses any focussed Quick specs'
     task :specs do
-      puts "Unfocussing specs..."
+      puts 'Unfocussing specs...'
 
       find_focussed_files_cmd = []
       find_focussed_files_cmd << 'grep -l -r -e'
@@ -26,39 +26,39 @@ namespace :ios do
         unfocus_cmd << "-e 's/fdescribe(/describe(/g;'"
         unfocus_cmd << "-e 's/fcontext(/context(/g;'"
         unfocus_cmd << "\"#{file_with_focussed_specs}\""
-        unfocus_cmd = unfocus_cmd.join(" ")
+        unfocus_cmd = unfocus_cmd.join(' ')
         system(unfocus_cmd)
       end
 
-      puts "Done!"
+      puts 'Done!'
     end
 
-    desc "Sorts the project file"
+    desc 'Sorts the project file'
     task :project_file do
-      puts "Sorting the project file..."
+      puts 'Sorting the project file...'
       system("script/sort-Xcode-project-file #{config.project_file_path}")
-      puts "Done!"
+      puts 'Done!'
     end
 
-    desc "Removes trailing whitespace from code files"
+    desc 'Removes trailing whitespace from code files'
     task :whitespace do
       file_extensions = %w{ h m swift }
       search_pattern = file_extensions.map { |ext| "-name \"*.#{ext}\""}.join(' -o ')
-      puts "Removing trailing whitespace..."
-      system("find #{config.app_targets.join(" ")} #{config.test_targets.join(" ")} #{search_pattern} -exec sed -i '' -e's/[ ]*$//' \"{}\" \\;")
-      puts "Done!"
+      puts 'Removing trailing whitespace...'
+      system("find #{config.app_targets.join(' ')} #{config.test_targets.join(" ")} #{search_pattern} -exec sed -i '' -e's/[ ]*$//' \"{}\" \\;")
+      puts 'Done!'
     end
 
-    desc "Runs swiftlint"
+    desc 'Runs swiftlint'
     task :lint do
-      puts "Linting..."
-      if !system("which swiftlint")
-        bail("Swiftlint is not installed - please install via `brew install swiftlint`")
+      puts 'Linting...'
+      unless system('which swiftlint')
+        bail('Swiftlint is not installed - please install via `brew install swiftlint`')
       end
-      if !system("swiftlint lint --strict")
-        bail("Code hygeine problems were detected via swiftlint")
+      unless system('swiftlint lint --strict')
+        bail('Code hygeine problems were detected via swiftlint')
       end
-      puts "Done!"
+      puts 'Done!'
     end
   end
 end

data/lib/ios_toolchain/tasks/shipit.rake

@@ -1,5 +1,5 @@
 
 desc "Checks that we're ready to push, and then pushes the current branch to origin"
 task :shipit => [:validate, "git:push_origin"]  do
-  puts "That ship has sailed! 😎"
+  puts 'That ship has sailed! 😎'
 end

data/lib/ios_toolchain/tasks/validate.rake

@@ -1,5 +1,5 @@
 
-desc "Checks you if you need to do any cleanup of the code before you push"
+desc 'Checks you if you need to do any cleanup of the code before you push'
 task :validate  do
    Rake::Task['git:check_for_uncommitted_changes'].invoke
    Rake::Task['ios:clean:build'].invoke

data/lib/ios_toolchain/version.rb

@@ -1,3 +1,3 @@
 module IosToolchain
-  VERSION = "0.2.2"
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ios_toolchain
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dennis Schmidt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler