Tokaido 2.2.0 release.

tokaido · Dec 26, 2014 · 3099ffe · 3099ffe
1 parent 1d48292
commit 3099ffe
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 17 deletions.
diff --git a/Scripts/gems.sh b/Scripts/gems.sh
@@ -3,16 +3,16 @@ tmp=$root/tmp
 
 mkdir -p $tmp/zips
 
-if [ -d $tmp/2.1.5-p273 ]
+if [ -d $tmp/2.2.0-p0 ]
 then
   echo "Tokaido Ruby is unzipped"
 else
   echo "Unzipping Tokaido Ruby"
-  cp "Tokaido/Rubies/2.1.5-p273.zip" $tmp/2.1.5-p273.zip
-  unzip $tmp/2.1.5-p273.zip -d $tmp
+  cp "Tokaido/Rubies/2.2.0-p0.zip" $tmp/2.2.0-p0.zip
+  unzip $tmp/2.2.0-p0.zip -d $tmp
 fi
 
-export PATH=$tmp/2.1.5-p273/bin:$PATH
+export PATH=$tmp/2.2.0-p0/bin:$PATH
 gem update --system --no-ri --no-rdoc
 gem uninstall rubygems-update
 gem_home="$tmp/bootstrap-gems"
@@ -107,12 +107,12 @@ rm -rf gem_home
 echo "Building new GEM_HOME"
 bundle --path gem_home --gemfile Gemfile
 
-gem install $puma/puma-2.10.2.gem -E --no-ri --no-rdoc -i $zips/gem_home/ruby/2.1.0
-gem install bundler -E --no-ri --no-rdoc -i $zips/gem_home/ruby/2.1.0
+gem install $puma/puma-2.10.2.gem -E --no-ri --no-rdoc -i $zips/gem_home/ruby/2.2.0
+gem install bundler -E --no-ri --no-rdoc -i $zips/gem_home/ruby/2.2.0
 
 rm -f tokaido-gems.zip
 rm -rf Gems
-cp -R gem_home/ruby/2.1.0 Gems
+cp -R gem_home/ruby/2.2.0 Gems
 
 
 mkdir -p Gems/supps

diff --git a/Tokaido/Rubies/2.2.0-p0.zip b/Tokaido/Rubies/2.2.0-p0.zip
diff --git a/Tokaido/TKDApp.m b/Tokaido/TKDApp.m
@@ -261,11 +261,16 @@ - (NSDictionary *)environment {
     return @{
              @"GEM_HOME": [TKDConfiguration gemsInstalledDirectoryPath],
              @"GEM_PATH": [TKDConfiguration gemsInstalledDirectoryPath],
-             @"PATH"    : [NSString stringWithFormat:@"%@:%@:%@:%@",
+             @"PATH"    : [NSString stringWithFormat:@"%@:%@:%@:%@:%@:%@:%@:%@:%@",
                            [TKDConfiguration binariesInstalledDirectoryPath],
                            [TKDUtilities rubyBinDirectory:[TKDConfiguration rubyVersion]],
                            [TKDConfiguration gemsBinaryInstalledDirectoryPath],
-                           @"/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/sbin:/usr/sbin:/Applications/Postgres.app/Contents/Versions/9.3/bin"] };
+                           @"/Applications/Postgres.app/Contents/Versions/9.3/bin",
+                           @"/bin",
+                           @"/usr/local/bin",
+                           @"/usr/bin",
+                           @"/sbin",
+                           @"/usr/sbin"] };
 }
 
 #pragma mark - TKDTaskDelegate methods

diff --git a/Tokaido/TKDConfiguration.h b/Tokaido/TKDConfiguration.h
@@ -56,6 +56,7 @@
 +(NSString *) rubiesInstalledDirectoryPath;
 +(NSString *) gemsInstalledDirectoryPath;
 +(NSString *) gemsBinaryInstalledDirectoryPath;
++(NSString *) magickInstalledDirectoryPath;
 
 +(NSString *) binariesInstalledDirectoryPath;
 

diff --git a/Tokaido/TKDConfiguration.m b/Tokaido/TKDConfiguration.m
@@ -5,11 +5,11 @@
 @implementation TKDConfiguration
 
 +(NSString *) rubyVersion {
-    return @"2.1.5-p273";
+    return @"2.2.0-p0";
 }
 
 +(NSArray *) rubiesBundled {
-    return @[[[TKDRubyBinary alloc] initWithName:@"2.1.5-p273"]];
+    return @[[[TKDRubyBinary alloc] initWithName:@"2.2.0-p0"]];
 }
 
 +(NSArray *) rubiesInstalled {
@@ -28,7 +28,7 @@ +(NSArray *) rubiesInstalled {
 }
 
 +(NSString *) rubyConfigInstalledFile {
-    return [[self rubiesInstalledDirectoryPath] stringByAppendingPathComponent:@"/2.1.5-p273/lib/ruby/2.1.0/x86_64-darwin12.0/rbconfig.rb"];
+    return [[self rubiesInstalledDirectoryPath] stringByAppendingPathComponent:@"/2.2.0-p0/lib/ruby/2.2.0/x86_64-darwin12.0/rbconfig.rb"];
 }
 
 +(NSString *) applicationName {
@@ -75,6 +75,10 @@ +(NSString *) compilerInstalledDirectoryPath {
     return [[self tokaidoLocalHomeDirectoryPath] stringByAppendingPathComponent:@"Clang"];
 }
 
++(NSString *) magickInstalledDirectoryPath {
+    return [[self gemsInstalledDirectoryPath] stringByAppendingPathComponent:@"/bin_files/magick"];
+}
+
 +(NSString *) bootstrapInstalledDirectoryPath {
     return [[self tokaidoLocalHomeDirectoryPath] stringByAppendingPathComponent:@"Bootstrap"];
 }

diff --git a/Tokaido/TKDEnsureAppSupportUpdated.m b/Tokaido/TKDEnsureAppSupportUpdated.m
@@ -98,12 +98,18 @@ -(void) applyRubyConfigPatches {
         NSTask *linkTask = [[NSTask alloc] init];
         [linkTask setLaunchPath:@"/bin/ln"];
         [linkTask setCurrentDirectoryPath:[self.configuration compilerInstalledDirectoryPath]];
-        [linkTask setArguments:@[ @"-s", @"/usr/bin/clang", @"clang" ] ];
+        [linkTask setArguments:@[ @"-f", @"-s", @"/usr/bin/clang", @"clang" ] ];
         [linkTask launch];
         [_view finished_clang_symlink];
     } else {
         [_view clang_not_found];
     }
+
+    NSTask *linkTask = [[NSTask alloc] init];
+    [linkTask setLaunchPath:@"/bin/ln"];
+    [linkTask setCurrentDirectoryPath:NSHomeDirectory()];
+    [linkTask setArguments:@[ @"-f", @"-s", [self.configuration magickInstalledDirectoryPath], @".magick" ] ];
+    [linkTask launch];
 }
 
 -(NSArray *) rubyInstallations {

diff --git a/Tokaido/TKDStartTokaido.m b/Tokaido/TKDStartTokaido.m
@@ -1,6 +1,7 @@
 #import "TKDStartTokaido.h"
 #import "TKDConfiguration.h"
 #import "TKDFileUtilities.h"
+#import "TKDUtilities.h"
 
 #import <ServiceManagement/ServiceManagement.h>
 
@@ -33,8 +34,17 @@ -(void) execute {
 	NSString *outPath = [[self configuration] firewallStandardOutInstalledFile];
 	NSString *errPath = [[self configuration] firewallStandardErrorInstalledFile];
 	NSString *gemHome = [[self configuration] gemsInstalledDirectoryPath];
-	NSString *gemPath = [[self configuration] gemsBinaryInstalledDirectoryPath];
-	NSString *path = [executableDirectory stringByAppendingFormat:@":%@", gemPath];
+    NSString *path = [NSString stringWithFormat:@"%@:%@:%@:%@:%@:%@:%@:%@:%@",
+                      [executableDirectory stringByAppendingString:@"bin"],
+                      [TKDUtilities rubyBinDirectory:[TKDConfiguration rubyVersion]],
+                      [TKDConfiguration gemsBinaryInstalledDirectoryPath],
+                      @"/Applications/Postgres.app/Contents/Versions/9.3/bin",
+                      @"/bin",
+                      @"/usr/local/bin",
+                      @"/usr/bin",
+                      @"/sbin",
+                      @"/usr/sbin"];
+
 
 	[_view unlinking_current_socket];
 	unlink([[self.configuration muxrSocketPath] UTF8String]);

diff --git a/Tokaido/TKDTask.m b/Tokaido/TKDTask.m
@@ -73,6 +73,7 @@ - (void)setEnvironment:(NSDictionary *)environment {
 
 - (NSDictionary *)environment {
     if (self.app) {
+        NSLog(@"%@", self.app.environment);
         return self.app.environment;
     } else {
         return _environment;

diff --git a/Tokaido/Tokaido-Info.plist b/Tokaido/Tokaido-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.5</string>
+	<string>2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.5</string>
+	<string>2.2.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Tokaido/uninstall.sh b/Tokaido/uninstall.sh
@@ -7,6 +7,7 @@ fi
 rm -rf ~/.tokaido
 rm -rf ~/Library/Application\ Support/Tokaido
 rm -rf /etc/resolvers/tokaido
+rm -rf ~/.magick
 rm /usr/include/iconv.h
 rm /usr/include/libcharset.h
 rm /usr/include/localcharset.h