Merge e9169ab into 0b3451c

.gitignore

@@ -1,21 +1,25 @@
-#xcode specific
+# OS X
+.DS_Store
+
+# Xcode
 build/
 *.pbxuser
-*.mode2v3
+!default.pbxuser
 *.mode1v3
-*.perspective
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
 *.perspectivev3
-*~.nib
-#ignore private workspace stuff added by Xcode4
+!default.perspectivev3
 xcuserdata
-project.xcworkspace
-
-## generic files to ignore
-*~
-*.lock
-*.DS_Store
-*.swp
-*.out
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
 
-.bundle/
+# Bundler
+.bundle
 vendor/

.travis.yml

@@ -1,14 +1,11 @@
 language: objective-c
-cache:
-  directories:
-    - vendor/bundle
 install:
   - sudo easy_install cpp-coveralls
-  - bundle install --path=vendor/bundle --binstubs=vendor/bin
+  - (cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)
 script:
-  - bundle exec rake ios:build osx:build ios:test osx:test
+  - (cd Lib && bundle exec rake test:ios test:osx)
 after_success:
-  - ./iOS/Script/coveralls.sh
+  - ./Lib/Script/coveralls.sh
 branches:
   only:
     - master

Lib/Gemfile.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.4.2)
+    xcjobs (0.0.4)
+    xcpretty (0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  xcjobs
+  xcpretty

Rakefile → Lib/Rakefile

@@ -14,45 +14,56 @@ def destinations
   ]
 end
 
-XCJobs::Build.new('ios:build') do |t|
-  t.workspace = 'UICKeyChainStore'
-  t.scheme = 'iOS'
+XCJobs::Build.new('build:simulator') do |t|
+  t.project = 'UICKeyChainStore'
+  t.scheme = 'UICKeyChainStore-iOS'
+  t.sdk = 'iphonesimulator'
   t.configuration = 'Release'
   t.build_dir = 'build'
   t.formatter = 'xcpretty -c'
   t.add_build_setting('CODE_SIGN_IDENTITY', '')
   t.add_build_setting('CODE_SIGNING_REQUIRED', 'NO')
 end
 
-XCJobs::Build.new('osx:build') do |t|
-  t.workspace = 'UICKeyChainStore'
-  t.scheme = 'Mac'
+XCJobs::Build.new('build:device') do |t|
+  t.project = 'UICKeyChainStore'
+  t.scheme = 'UICKeyChainStore-iOS'
+  t.sdk = 'iphoneos'
+  t.configuration = 'Release'
+  t.build_dir = 'build'
+  t.formatter = 'xcpretty -c'
+  t.add_build_setting('CODE_SIGN_IDENTITY', '')
+  t.add_build_setting('CODE_SIGNING_REQUIRED', 'NO')
+end
+
+XCJobs::Build.new('build:osx') do |t|
+  t.project = 'UICKeyChainStore'
+  t.scheme = 'UICKeyChainStore-Mac'
   t.configuration = 'Release'
-  t.sdk = 'macosx'
   t.build_dir = 'build'
   t.formatter = 'xcpretty -c'
+  t.add_build_setting('CODE_SIGN_IDENTITY', '')
+  t.add_build_setting('CODE_SIGNING_REQUIRED', 'NO')
 end
 
-XCJobs::Test.new('ios:test') do |t|
-  t.workspace = 'UICKeyChainStore'
-  t.scheme = 'iOS'
+XCJobs::Test.new('test:ios') do |t|
+  t.project = 'UICKeyChainStore'
+  t.scheme = 'libUICKeyChainStore-iOS'
   t.configuration = 'Release'
+  t.build_dir = 'build'
   destinations.each do |destination|
     t.add_destination(destination)
   end
-  t.build_dir = 'build'
   t.formatter = 'xcpretty -c'
   t.add_build_setting('GCC_INSTRUMENT_PROGRAM_FLOW_ARCS', 'YES')
   t.add_build_setting('GCC_GENERATE_TEST_COVERAGE_FILES', 'YES')
 end
 
-XCJobs::Test.new('osx:test') do |t|
-  t.workspace = 'UICKeyChainStore'
-  t.scheme = 'Mac'
-  t.configuration = 'Release'
+XCJobs::Test.new('test:osx') do |t|
+  t.project = 'UICKeyChainStore'
+  t.scheme = 'libUICKeyChainStore-Mac'
   t.sdk = 'macosx'
+  t.configuration = 'Release'
   t.build_dir = 'build'
   t.formatter = 'xcpretty -c'
-  t.add_build_setting('GCC_INSTRUMENT_PROGRAM_FLOW_ARCS', 'YES')
-  t.add_build_setting('GCC_GENERATE_TEST_COVERAGE_FILES', 'YES')
 end

iOS/Script/create-coveralls-script.sh → Lib/Script/create-coveralls-script.sh

@@ -13,7 +13,7 @@ for file in *.gcda; do
   gcov "\${file}"
 done
 
-coveralls --root "${SRCROOT}/../" -e "iOS" --no-gcov
+coveralls --root "${SRCROOT}/../" --extension ".m" -e "Lib/UICKeyChainStoreTests/" -e "Lib/vendor/" --no-gcov
 EOF
 
 chmod +x "${COVERALLS_SCRIPT_PATH}"