Merge branch 'release/1.6.1'

jdewind · jdewind · commit 63269dc9ca1f · 2015-07-30T11:05:14.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
 language: objective-c
 script: rake specs:all
-
+osx_image: xcode6.4
+install:
+  - bundle install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,3 +18,11 @@ Nothing in this version has changed that would cause those that are upgrading fr
 **[Changes](#changes)**
 
 1. Ad-Hoc initializers can be used via the JSObjectionInjector and JSObjectFactory
+
+# 1.6.1
+
+**[Changes](#changes)**
+
+1. Fixed build issues in XCode 6.4 and updated Nimble & Quick testing libraries
+2. Improved test output via xcpretty
+3. Fixed regression raised in issue #94 (https://github.com/atomicobject/objection/issues/94)
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gem "xcpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,10 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    xcpretty (0.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  xcpretty
diff --git a/Objection-Info.plist b/Objection-Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6</string>
+	<string>1.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>ATOM</string>
 	<key>CFBundleVersion</key>
-	<string>1.6</string>
+	<string>1.6.1</string>
 </dict>
 </plist>
diff --git a/Objection.podspec b/Objection.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Objection'
-  s.version      = '1.6'
+  s.version      = '1.6.1'
   s.summary      = 'A lightweight dependency injection framework for Objective-C.'
   s.author       = { 'Justin DeWind' => 'dewind@atomicobject.com' }
   s.source       = { :git => 'https://github.com/atomicobject/objection.git', :tag => "#{s.version}" }
diff --git a/Objection.xcodeproj/project.pbxproj b/Objection.xcodeproj/project.pbxproj
@@ -699,7 +699,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0640;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Objection" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -1016,10 +1016,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					"$(ARCHS_STANDARD)",
-					armv7s,
-				);
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/Objection.dst;
@@ -1045,10 +1041,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					"$(ARCHS_STANDARD)",
-					armv7s,
-				);
 				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/Objection.dst;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1079,6 +1071,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1105,6 +1098,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1120,7 +1114,6 @@
 		4B25BE4B1291C43400821DC1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1134,7 +1127,6 @@
 		4B25BE4C1291C43400821DC1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -1151,7 +1143,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
@@ -1195,7 +1186,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
@@ -1235,7 +1225,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -1274,7 +1263,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
diff --git a/Objection.xcodeproj/xcshareddata/xcschemes/Objection-StaticLib.xcscheme b/Objection.xcodeproj/xcshareddata/xcschemes/Objection-StaticLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Objection.xcodeproj/xcshareddata/xcschemes/Objection-iOS.xcscheme b/Objection.xcodeproj/xcshareddata/xcschemes/Objection-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Objection.xcodeproj/xcshareddata/xcschemes/Objection.xcscheme b/Objection.xcodeproj/xcshareddata/xcschemes/Objection.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Objection.xcodeproj/xcshareddata/xcschemes/Specs-OSX.xcscheme b/Objection.xcodeproj/xcshareddata/xcschemes/Specs-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Objection.xcodeproj/xcshareddata/xcschemes/Specs-iOS.xcscheme b/Objection.xcodeproj/xcshareddata/xcschemes/Specs-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/README.md b/README.md
@@ -358,7 +358,9 @@ objection_initializer(truckWithMake:model:)
 @end
 
 - (void)buildCar {
-  ConfigurableCar *car = [self.objectFactory getObject:[ConfigurableCar class], initializer: @selector(initWithModel:) withArgumentList:@[@"VW", @"Passat"]];
+  ConfigurableCar *car = [self.objectFactory getObject:[ConfigurableCar class], 
+                                           initializer: @selector(initWithModel:) 
+                                           withArgumentList:@[@"Passat"]];
 }
 ```
 
@@ -406,7 +408,7 @@ It can be downloaded [here](http://objection-framework.org/files/Objection-1.5.t
 Edit your Pofile
 
     edit Podfile
-    pod 'Objection', '1.6'
+    pod 'Objection', '1.6.1'
 
 Now you can install Objection
     
diff --git a/Rakefile b/Rakefile
@@ -30,12 +30,12 @@ end
 namespace :artifact do
   desc "Build OSX Framework"
   task :osx => :clean do
-    system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection -configuration Release build], nil)
+    system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection -configuration Release build | xcpretty -c], nil)
   end
   
   desc "Build iOS Framework"
   task :ios  => :clean do
-    system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection-iOS -configuration Release build] , nil)
+    system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection-iOS -configuration Release build | xcpretty -c] , nil)
   end                             
   
   require 'rake/clean'
@@ -56,28 +56,33 @@ end
   
 task :clean do
   stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "clean.output") if (ENV['IS_CI_BOX'])
-  system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean], stdout)
+  system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean | xcpretty -c], stdout)
 end
 
 task :build_all do
   stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_all.output") if (ENV['IS_CI_BOX'])
-  system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build], stdout)
+  system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build | xcpretty -c], stdout)
 end
 
+task :publish do
+  system_or_exit %Q[pod trunk publish Objection.podspec --allow-warnings]
+end
+
+
 namespace :specs do
   desc "All Specs"
   task :all => [:osx, :ios]
 
   desc "OS X Specs"
   task :osx do
     stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_specs.output") if (ENV['IS_CI_BOX'])
-    system_or_exit(%Q[#{xcodebuild_executable} test -project #{PROJECT_NAME}.xcodeproj -scheme #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION}], stdout)
+    system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} test -project #{PROJECT_NAME}.xcodeproj -scheme #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION} | xcpretty -c], stdout)
   end
 
   desc "iOS Specs"
   task :ios do
     stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_uispecs.output") if (ENV['IS_CI_BOX'])
     ENV["TEST_AFTER_BUILD"] = "Yes"
-    system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -scheme #{UI_SPECS_TARGET_NAME} -sdk iphonesimulator -configuration #{CONFIGURATION} -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' test ], stdout)
+    system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -scheme #{UI_SPECS_TARGET_NAME} -sdk iphonesimulator -configuration #{CONFIGURATION} -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' test | xcpretty -c], stdout)
   end
 end
diff --git a/Source/JSObjectionProviderEntry.m b/Source/JSObjectionProviderEntry.m
@@ -10,6 +10,7 @@ @interface JSObjectionProviderEntry () {
 @end
 
 @implementation JSObjectionProviderEntry
+@synthesize lifeCycle = _lifeCycle;
 
 - (id)initWithProvider:(id<JSObjectionProvider>)theProvider lifeCycle:(JSObjectionScope)theLifeCycle {
     if ((self = [super init])) {
diff --git a/Specs/BasicUsageSpecs.m b/Specs/BasicUsageSpecs.m
@@ -60,7 +60,7 @@
     [[JSObjection defaultInjector] injectDependencies:car];
 
     assertThatBool([car awake], isTrue());
-    assertThatBool([car.engine awake], isFalse());
+    assertThatBool([car.engine awake], isTrue());
 });
 
 it(@"defaults to returning a new instance", ^{
@@ -112,7 +112,7 @@
       id car = [[JSObjection defaultInjector] getObject:[Car class]];
 
       assertThatBool([engine awake], isTrue());
-      assertThatBool([car awake], isFalse());
+      assertThatBool([car awake], isTrue());
 });
 
 
diff --git a/Vendor/Nimble b/Vendor/Nimble
@@ -1 +1 @@
-Subproject commit 1088d5f70497f34be946e3e2829a10529f7bea8e
+Subproject commit b89db8654c5f134d4f68e706b6da4a5581cb2001
diff --git a/Vendor/Quick b/Vendor/Quick
@@ -1 +1 @@
-Subproject commit f1cf75645306230d91c99f2afbe8ac5ae147f6b3
+Subproject commit e67be524aff14fa6618e4cc57199813cc25b6011

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+source "http://rubygems.org"`
	`2`	`+gem "xcpretty"`