Skip to content

Commit

Permalink
Dump RestKit gem in favor of RakeUp (https://github.com/blakewatters/…
Browse files Browse the repository at this point in the history
  • Loading branch information
blakewatters committed May 15, 2013
1 parent f7af9e3 commit 656c2d6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 56 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ gem "rake", "~> 10.0.0"
gem "bundler", "~> 1.3.0"
gem "sinatra", :git => "git://github.com/sinatra/sinatra.git"
gem "thin", "~> 1.5.0"
gem 'restkit', :git => 'git://github.com/RestKit/RestKit-Gem.git'
gem 'debugger', '~> 1.3.0'
gem 'cocoapods', '0.19.1'
gem 'rakeup', '~> 1.0.0'
15 changes: 8 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
GIT
remote: git://github.com/RestKit/RestKit-Gem.git
revision: 96058139a46c46aa344c1481e8c75b390c82d5e9
specs:
restkit (0.0.0)

GIT
remote: git://github.com/sinatra/sinatra.git
revision: f12a26cdf86c66baa6d6958aad20fea327558e04
Expand Down Expand Up @@ -68,10 +62,17 @@ GEM
multi_json (~> 1.3)
netrc (~> 0.7.7)
open4 (1.3.0)
puma (2.0.1)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-protection (1.5.0)
rack
rake (10.0.4)
rakeup (1.0.0)
puma (~> 2.0.1)
rack (~> 1.5.0)
rake (~> 10.0.0)
thin (~> 1.5.1)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand All @@ -89,6 +90,6 @@ DEPENDENCIES
cocoapods (= 0.19.1)
debugger (~> 1.3.0)
rake (~> 10.0.0)
restkit!
rakeup (~> 1.0.0)
sinatra!
thin (~> 1.5.0)
10 changes: 3 additions & 7 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
require 'rubygems'
require 'bundler/setup'
require 'restkit/rake'
require 'rakeup'
require 'debugger'

RestKit::Rake::ServerTask.new do |t|
RakeUp::ServerTask.new do |t|
t.port = 4567
t.pid_file = 'Tests/Server/server.pid'
t.rackup_file = 'Tests/Server/server.ru'
t.log_file = 'Tests/Server/server.log'

t.adapter(:thin) do |thin|
thin.config_file = 'Tests/Server/thin.yml'
end
t.server = :thin
end

namespace :test do
Expand Down
28 changes: 0 additions & 28 deletions RestKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,6 @@
251610E91456F2330060A5C5 /* RKMIMETypeSerializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610271456F2330060A5C5 /* RKMIMETypeSerializationTest.m */; };
251610F01456F2340060A5C5 /* RKTestEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610361456F2330060A5C5 /* RKTestEnvironment.m */; };
251610F11456F2340060A5C5 /* RKTestEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610361456F2330060A5C5 /* RKTestEnvironment.m */; };
251611031456F2340060A5C5 /* authentication.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2516104B1456F2330060A5C5 /* authentication.rb */; };
251611051456F2340060A5C5 /* etags.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2516104C1456F2330060A5C5 /* etags.rb */; };
251611091456F2340060A5C5 /* timeout.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2516104E1456F2330060A5C5 /* timeout.rb */; };
2516110B1456F2340060A5C5 /* restkit.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2516104F1456F2330060A5C5 /* restkit.rb */; };
2516110D1456F2340060A5C5 /* server.rb in Resources */ = {isa = PBXBuildFile; fileRef = 251610501456F2330060A5C5 /* server.rb */; };
2516110E1456F2340060A5C5 /* RKURLEncodedSerializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610521456F2330060A5C5 /* RKURLEncodedSerializationTest.m */; };
2516110F1456F2340060A5C5 /* RKURLEncodedSerializationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 251610521456F2330060A5C5 /* RKURLEncodedSerializationTest.m */; };
Expand Down Expand Up @@ -790,11 +786,6 @@
251610271456F2330060A5C5 /* RKMIMETypeSerializationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKMIMETypeSerializationTest.m; sourceTree = "<group>"; };
251610351456F2330060A5C5 /* RKTestEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKTestEnvironment.h; sourceTree = "<group>"; };
251610361456F2330060A5C5 /* RKTestEnvironment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKTestEnvironment.m; sourceTree = "<group>"; };
2516104B1456F2330060A5C5 /* authentication.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = authentication.rb; sourceTree = "<group>"; };
2516104C1456F2330060A5C5 /* etags.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = etags.rb; sourceTree = "<group>"; };
2516104D1456F2330060A5C5 /* oauth2.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = oauth2.rb; sourceTree = "<group>"; };
2516104E1456F2330060A5C5 /* timeout.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = timeout.rb; sourceTree = "<group>"; };
2516104F1456F2330060A5C5 /* restkit.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = restkit.rb; sourceTree = "<group>"; };
251610501456F2330060A5C5 /* server.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = server.rb; sourceTree = "<group>"; };
251610521456F2330060A5C5 /* RKURLEncodedSerializationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKURLEncodedSerializationTest.m; sourceTree = "<group>"; };
251610531456F2330060A5C5 /* NSStringRestKitTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSStringRestKitTest.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -968,7 +959,6 @@
25FBB851159272DD00955D27 /* RKRouter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKRouter.m; sourceTree = "<group>"; };
3E886DC0169E10A70069C56B /* has_many_with_to_one_relationship.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = has_many_with_to_one_relationship.json; sourceTree = "<group>"; };
3EB0D83816ADCEFC00E9CEA2 /* empty_human.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = empty_human.json; sourceTree = "<group>"; };
41A4EBF715374D1800740BC8 /* redirection.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = redirection.rb; sourceTree = "<group>"; };
5C927E131608FFFD00DC8B07 /* RKDictionaryUtilitiesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKDictionaryUtilitiesTest.m; sourceTree = "<group>"; };
5CCC295515B7124A0045F0F5 /* RKMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKMacros.h; sourceTree = "<group>"; };
7394DF3514CF157A00CE7BCE /* RKManagedObjectCaching.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKManagedObjectCaching.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1539,31 +1529,17 @@
isa = PBXGroup;
children = (
251610491456F2330060A5C5 /* restkit */,
2516104F1456F2330060A5C5 /* restkit.rb */,
);
path = lib;
sourceTree = "<group>";
};
251610491456F2330060A5C5 /* restkit */ = {
isa = PBXGroup;
children = (
2516104A1456F2330060A5C5 /* network */,
);
path = restkit;
sourceTree = "<group>";
};
2516104A1456F2330060A5C5 /* network */ = {
isa = PBXGroup;
children = (
41A4EBF715374D1800740BC8 /* redirection.rb */,
2516104B1456F2330060A5C5 /* authentication.rb */,
2516104C1456F2330060A5C5 /* etags.rb */,
2516104D1456F2330060A5C5 /* oauth2.rb */,
2516104E1456F2330060A5C5 /* timeout.rb */,
);
path = network;
sourceTree = "<group>";
};
251610511456F2330060A5C5 /* Support */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2167,10 +2143,6 @@
2516109D1456F2330060A5C5 /* orders.xml in Resources */,
2516109F1456F2330060A5C5 /* tab_data.xml in Resources */,
251610A11456F2330060A5C5 /* zend.xml in Resources */,
251611031456F2340060A5C5 /* authentication.rb in Resources */,
251611051456F2340060A5C5 /* etags.rb in Resources */,
251611091456F2340060A5C5 /* timeout.rb in Resources */,
2516110B1456F2340060A5C5 /* restkit.rb in Resources */,
2516110D1456F2340060A5C5 /* server.rb in Resources */,
73D3907514CA1AE20093E3D6 /* parent.json in Resources */,
73D3907714CA1AE60093E3D6 /* child.json in Resources */,
Expand Down
13 changes: 0 additions & 13 deletions Tests/Server/thin.yml

This file was deleted.

0 comments on commit 656c2d6

Please sign in to comment.