cocoapods-playgrounds 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 333cec7d10b19b1369c3f332481cdf46654c193e
-  data.tar.gz: 2e8f9b47ae5058b395af372b2562c79c514e0df5
+  metadata.gz: 664af3506c1df8fe9e1926d49a8237737b3d1f45
+  data.tar.gz: 1f4ceb634c9512368b60c3f5c775448b217a4b7f
 SHA512:
-  metadata.gz: a2cca40587f1bd4f12af215736857151902864bed002d72cf37b107cbac454e1bc1dc43e7503f21d9782eff605853ef23834cb1eb484b65b3720ee2601ad6406
-  data.tar.gz: c584e65a2b5d37e74e39ac07577704d5e4532fb623ea3533a0bab8c7a7f9eccf9d84a2c20374b9077803e7a78a90d06fde5be98221c0d536436984ce74e83123
+  metadata.gz: d7f5ba78344d4389c71751b86c77cce42a63422ffee19351e8fa341f882f24d758b737596480861657bd00dd323f65e085181f115ab519ab3213d790d0e3b169
+  data.tar.gz: e69861709b8909b4f44c6e11fcb33b54ffa9c7e9f05806da0ac0d29464115a769a29f0e09f951b6943b0c39bf024def4326d13875c7d0218346a325ac6d292f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-playgrounds (1.2.1)
+    cocoapods-playgrounds (1.2.2)
       cocoapods (>= 1.0.0, < 2.0)
 
 GEM

data/lib/cocoapods-playgrounds/command/playgrounds.rb

@@ -15,10 +15,7 @@ module Pod
 
       def self.options
         [
-          ['--ipad', 'Create an iPad compatible Playground.'],
           ['--no-install', 'Skip running `pod install`'],
-          ['--no-migrate', 'Skip Swift migration for iPad Playgrounds.'],
-          ['--no-open', 'Do not open Xcode after generating the Playground.'],
           ['--platform', "Platform to generate for (default: #{DEFAULT_PLATFORM_NAME})"],
           ['--platform_version', 'Platform version to generate for ' \
             "(default: #{default_version_for_platform(DEFAULT_PLATFORM_NAME)})"]
@@ -33,9 +30,6 @@ module Pod
         arg = argv.shift_argument
         @names = arg.split(',') if arg
         @install = argv.flag?('install', true)
-        @ipad = argv.flag?('ipad', false)
-        @migrate = argv.flag?('migrate', true)
-        @open = argv.flag?('open', true) && !@ipad
         @platform = argv.option('platform', DEFAULT_PLATFORM_NAME).to_sym
         @platform_version = argv.option('platform_version', Playgrounds.default_version_for_platform(@platform))
         super
@@ -49,41 +43,7 @@ module Pod
       def run
         # TODO: Pass platform and deployment target from configuration
         generator = WorkspaceGenerator.new(@names, :cocoapods, @platform, @platform_version)
-        name = generator.generate(@install, @open)
-
-        if @ipad
-          FileUtils.rm_rf(Dir.glob("#{name}Playground/*.xcodeproj"))
-          FileUtils.rm_rf(Dir.glob("#{name}Playground/*.xcworkspace"))
-          FileUtils.rm_f(Dir.glob("#{name}Playground/Podfile*"))
-
-          playground_files = "#{name}Playground/#{name}.playground/Sources"
-          FileUtils.mkdir_p(playground_files)
-          pods = "#{name}Playground/Pods"
-
-          Dir.glob("#{pods}/**/*.swift").each do |file|
-            if @migrate
-              migrate(file, "#{playground_files}/#{File.basename(file)}")
-            else
-              FileUtils.cp(file, playground_files)
-            end
-          end
-          FileUtils.rm_rf(pods)
-
-          File.open("#{name}Playground/#{name}.playground/Contents.swift", 'w') do |f|
-            f.write("import PlaygroundSupport\n")
-            f.write("PlaygroundPage.current.needsIndefiniteExecution = true\n\n")
-          end
-        end
-      end
-
-      private
-
-      # Thanks to http://swift.ayaka.me/posts/2016/6/17/running-the-swift-30-migrator-on-a-standalone-swift-file
-      def migrate(input, output)
-        xcode_path = `xcode-select -p`.strip
-        sdk_path = "#{xcode_path}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
-        `xcrun swift-update -sdk '#{sdk_path}' -target arm64-apple-ios9 #{input} >#{output}`
-        FileUtils.cp(input, output) if $?.exitstatus != 0
+        generator.generate(@install)
       end
     end
   end

data/lib/cocoapods-playgrounds/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPlaygrounds
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/lib/cocoapods-playgrounds/generate.rb

@@ -30,11 +30,16 @@ module Pod
       xcode + TEMPLATE_DIR
     end
 
+    def self.major_version
+      `xcodebuild -version`.split("\n").first.split(' ')[1].split('.').first.to_i
+    end
+
     def self.platform_name(file)
       file.downcase.sub(' ', '').to_sym
     end
 
     def self.dir_for_platform(platform)
+      platform = :macos if major_version == 8 && platform.to_sym == :osx
       Dir.foreach(template_dir) do |file|
         return (template_dir + file) if platform_name(file) == platform
       end

data/lib/cocoapods-playgrounds/workspace.rb

@@ -15,7 +15,7 @@ module Pod
       @tool = tool
     end
 
-    def generate(install = true, open = true)
+    def generate(install = true)
       @cwd = Pathname.getwd
       `rm -fr '#{target_dir}'`
       FileUtils.mkdir_p(target_dir)
@@ -28,8 +28,7 @@ module Pod
         generate_swift_code(path)
       end
 
-      `open #{workspace_path}` if install && open
-      names.first
+      `open #{workspace_path}` if install
     end
 
     private
@@ -148,12 +147,17 @@ EOT
       project_path = "#{names.first}.xcodeproj"
       project = Xcodeproj::Project.new(project_path)
 
-      target = project.new_target(:framework,
+      target = project.new_target(:application,
                                   target_name,
                                   @platform,
                                   @deployment_target)
       target.build_configurations.each do |config|
+        config.build_settings['ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME'] = 'LaunchImage'
+        config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = ''
+        config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        config.build_settings['CODE_SIGNING_REQUIRED'] = 'NO'
         config.build_settings['DEFINES_MODULE'] = 'NO'
+        config.build_settings['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'NO'
       end
 
       # TODO: Should be at the root of the project

data/spec/generate_spec.rb

@@ -12,7 +12,8 @@ module Pod
     it 'can list available platforms for Playgrounds' do
       platforms = PlaygroundGenerator.platforms
 
-      platforms.should == [:ios, :osx, :tvos]
+      expected_platforms = PlaygroundGenerator.major_version == 8 ? [:ios, :macos, :tvos] : [:ios, :osx, :tvos]
+      platforms.should == expected_platforms
     end
 
     it 'returns nil if template for platform cannot be found' do
@@ -24,7 +25,8 @@ module Pod
     it 'can find the template for OS X' do
       platform = PlaygroundGenerator.dir_for_platform(:osx)
 
-      platform.to_s.end_with?('OS X').should == true
+      suffix = PlaygroundGenerator.major_version == 8 ? 'macOS' : 'OS X'
+      platform.to_s.end_with?(suffix).should == true
     end
 
     it 'can find the template for iOS' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-playgrounds
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods