From 4fbafc15bcb1d7e154a31a6f224174be35791357 Mon Sep 17 00:00:00 2001 From: orta Date: Sun, 18 Dec 2016 10:15:40 -0500 Subject: [PATCH 1/3] WIP for cp 1.1.0 --- Rakefile | 6 +++--- app/CPReflectionService/Info.plist | 4 ++-- app/CocoaPods/Supporting Files/Info.plist | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 7ddb11ff..7cad21c7 100644 --- a/Rakefile +++ b/Rakefile @@ -116,10 +116,10 @@ NCURSES_URL = "http://ftpmirror.gnu.org/ncurses/ncurses-#{NCURSES_VERSION}.tar.g READLINE_VERSION = '6.3' READLINE_URL = "http://ftpmirror.gnu.org/readline/readline-#{READLINE_VERSION}.tar.gz" -RUBY__VERSION = '2.2.3' +RUBY__VERSION = '2.2.6' RUBY_URL = "http://cache.ruby-lang.org/pub/ruby/2.2/ruby-#{RUBY__VERSION}.tar.gz" -RUBYGEMS_VERSION = '2.5.0' +RUBYGEMS_VERSION = '2.6.8' RUBYGEMS_URL = "https://rubygems.org/downloads/rubygems-update-#{RUBYGEMS_VERSION}.gem" CURL_VERSION = '7.41.0' @@ -586,7 +586,7 @@ directory installed_cocoapods_plugins_install => installed_pod_bin do end pod_check = "cocoapods-check" -pod_check_version = "0.2.1.beta.1" +pod_check_version = "1.0.0" installed_cocoapods_check_install = File.join(GEM_HOME, 'gems', "#{pod_check}-#{pod_check_version}") directory installed_cocoapods_check_install => installed_pod_bin do install_gem pod_check, pod_check_version diff --git a/app/CPReflectionService/Info.plist b/app/CPReflectionService/Info.plist index 976ae12b..f41ef5c4 100644 --- a/app/CPReflectionService/Info.plist +++ b/app/CPReflectionService/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0.0 + 1.1.1 CFBundleSignature ???? CFBundleVersion - 1.0.0 + 1.1.1 NSHumanReadableCopyright Copyright © 2016 CocoaPods. All rights reserved. XPCService diff --git a/app/CocoaPods/Supporting Files/Info.plist b/app/CocoaPods/Supporting Files/Info.plist index b5323e43..c31fac71 100644 --- a/app/CocoaPods/Supporting Files/Info.plist +++ b/app/CocoaPods/Supporting Files/Info.plist @@ -56,7 +56,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.1.1 CFBundleSignature ???? CFBundleURLTypes @@ -73,7 +73,7 @@ CFBundleVersion - 1.0.0 + 1.1.1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright From 788511201a5d36d0496f1a113ebff7c447c3b77a Mon Sep 17 00:00:00 2001 From: orta Date: Wed, 21 Dec 2016 16:10:49 -0500 Subject: [PATCH 2/3] Ensure that we are exposing the right ruby c modules for the changes to rubygems/cp since the last release --- Rakefile | 5 ++++- app/CPReflectionService/RBObject+CocoaPods.m | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 7cad21c7..87d814c4 100644 --- a/Rakefile +++ b/Rakefile @@ -491,7 +491,7 @@ class RubyTasks < BundleDependencyTasks def define_install_libruby_task file installed_libruby_path => artefact_path do cp artefact_path, installed_libruby_path - %w{ bigdecimal date/date_core.a digest fiddle pathname psych stringio strscan }.each do |ext| + %w{ bigdecimal date/date_core.a digest digest/md5/md5.a fiddle pathname psych stringio strscan socket }.each do |ext| ext = "#{ext}/#{ext}.a" unless File.extname(ext) == '.a' execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, File.join(build_dir, 'ext', ext) end @@ -502,6 +502,9 @@ class RubyTasks < BundleDependencyTasks installed_dependencies.each do |installed_dependency| execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, installed_dependency end + + # `digest/md5/md5.a` requires "_MD5_Init" which is only available inside libcrypto.a + execute '/usr/bin/libtool', '-static', '-o', installed_libruby_path, installed_libruby_path, File.join(DESTROOT, 'dependencies', 'lib', 'libcrypto.a') end end diff --git a/app/CPReflectionService/RBObject+CocoaPods.m b/app/CPReflectionService/RBObject+CocoaPods.m index 70e75137..643175ef 100644 --- a/app/CPReflectionService/RBObject+CocoaPods.m +++ b/app/CPReflectionService/RBObject+CocoaPods.m @@ -53,6 +53,10 @@ rb_provide("fiddle.so"); INIT_EXT(psych); rb_provide("psych.so"); + INIT_EXT(socket); + rb_provide("socket.so"); + INIT_EXT(md5); + rb_provide("digest/md5.so"); #define PROVIDE_EXT(name) INIT_EXT(name); rb_provide(#name); PROVIDE_EXT(bigdecimal); From 39afebd4e266cda18f93e4e7b2d8ca1a184fe2cd Mon Sep 17 00:00:00 2001 From: orta Date: Wed, 21 Dec 2016 17:02:37 -0500 Subject: [PATCH 3/3] Don't save the history of where the window is --- app/CPReflectionService/RBObject+CocoaPods.rb | 3 +-- app/CocoaPods/Podfile.storyboard | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/CPReflectionService/RBObject+CocoaPods.rb b/app/CPReflectionService/RBObject+CocoaPods.rb index d5232012..8cc60bda 100644 --- a/app/CPReflectionService/RBObject+CocoaPods.rb +++ b/app/CPReflectionService/RBObject+CocoaPods.rb @@ -58,8 +58,7 @@ def self.analyze_podfile(podfile, installation_root) end uses_frameworks = config.podfile.target_definitions.first.last.to_hash["uses_frameworks"] - last_installed_version = config.sandbox.manifest.cocoapods_version.to_s - + last_installed_version = config.sandbox.manifest && config.sandbox.manifest.cocoapods_version.to_s { "projects" => user_projects, "pod_targets" => pod_targets, diff --git a/app/CocoaPods/Podfile.storyboard b/app/CocoaPods/Podfile.storyboard index 4e26cc6e..d05fd744 100644 --- a/app/CocoaPods/Podfile.storyboard +++ b/app/CocoaPods/Podfile.storyboard @@ -1,14 +1,14 @@ - + - + - + @@ -391,7 +391,7 @@ -