From 583302920a502a56deb77524b9041e37418f2ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20N=2E=20Robalino?= Date: Tue, 21 Apr 2015 23:50:40 -0500 Subject: [PATCH] Tokaido 2.2 (Ruby 2.2.2) release. --- Tokaido/SetupTokaido.sh | 2 +- Tokaido/TKDConfiguration.m | 8 ++++---- Tokaido/TKDTerminalSessions.m | 2 ++ Tokaido/Tokaido-Info.plist | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Tokaido/SetupTokaido.sh b/Tokaido/SetupTokaido.sh index e10bf0f..5f7d5fa 100755 --- a/Tokaido/SetupTokaido.sh +++ b/Tokaido/SetupTokaido.sh @@ -2,7 +2,7 @@ clear BIN="$HOME/.tokaido/bin" -export TOKAIDO_GEM_HOME=$HOME/.tokaido/Gems/2.1.0 +export TOKAIDO_GEM_HOME=$HOME/.tokaido/Gems/$TOKAIDO_GEM_NAMESPACE export GEM_HOME=$TOKAIDO_GEM_HOME export GEM_PATH=$TOKAIDO_GEM_HOME export PATH=$BIN:$TOKAIDO_PATH:$GEM_HOME/bin:$PATH diff --git a/Tokaido/TKDConfiguration.m b/Tokaido/TKDConfiguration.m index 2825a98..9da8a8d 100644 --- a/Tokaido/TKDConfiguration.m +++ b/Tokaido/TKDConfiguration.m @@ -5,15 +5,15 @@ @implementation TKDConfiguration +(NSString *) rubyVersion { - return @"2.1.6-p336"; + return @"2.2.2-p95"; } +(NSString *) rubyNamespace { - return @"2.1.0"; + return @"2.2.0"; } +(NSArray *) rubiesBundled { - return @[[[TKDRubyBinary alloc] initWithName:@"2.1.6-p336"]]; + return @[[[TKDRubyBinary alloc] initWithName:@"2.2.2-p95"]]; } +(NSArray *) rubiesInstalled { @@ -32,7 +32,7 @@ +(NSArray *) rubiesInstalled { } +(NSString *) rubyConfigInstalledFile { - return [[self rubiesInstalledDirectoryPath] stringByAppendingPathComponent:@"/2.1.6-p336/lib/ruby/2.1.0/x86_64-darwin12.0/rbconfig.rb"]; + return [[self rubiesInstalledDirectoryPath] stringByAppendingPathComponent:@"/2.2.2-p95/lib/ruby/2.2.0/x86_64-darwin12.0/rbconfig.rb"]; } +(NSString *) applicationName { diff --git a/Tokaido/TKDTerminalSessions.m b/Tokaido/TKDTerminalSessions.m index 6a8fae1..1e010af 100644 --- a/Tokaido/TKDTerminalSessions.m +++ b/Tokaido/TKDTerminalSessions.m @@ -25,8 +25,10 @@ - (NSString *) sessionFor:(TKDApp *)app { NSString *rubyBinPath = [TKDUtilities rubyBinDirectory:[TKDConfiguration rubyVersion]]; NSString *appDirectory = [TKDUtilities sanitizePath:app.appDirectoryPath]; + NSString *rubyNamespace = [TKDConfiguration rubyNamespace]; NSArray *commands = @[ + [NSString stringWithFormat:@"export TOKAIDO_GEM_NAMESPACE=%@", rubyNamespace], [NSString stringWithFormat:@"export TOKAIDO_PATH=%@", rubyBinPath], [NSString stringWithFormat:@"export TOKAIDO_APP_DIR=%@", appDirectory], [NSString stringWithFormat:@"source %@", [TKDConfiguration terminalSetupScriptInstalledDirectoryPath]] diff --git a/Tokaido/Tokaido-Info.plist b/Tokaido/Tokaido-Info.plist index b27f4d4..a41bc34 100644 --- a/Tokaido/Tokaido-Info.plist +++ b/Tokaido/Tokaido-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.1 + 2.2 CFBundleSignature ???? CFBundleVersion - 2.1.6 + 2.2.2 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion