cocoapods-try 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 148ca9e619a1f63d94bf681574b8c04d551b92e2
-  data.tar.gz: e1de8f33e8256c4129782d157839f393da6cc2b4
+  metadata.gz: ea75c16ca0ccd1530ab19b3a0d461fffcf0671c6
+  data.tar.gz: 3703e30185d9cc9b2d0212182530c3dca6938e7b
 SHA512:
-  metadata.gz: b6a47ab3b7edf2f088e64fc74ca2e1f621282760e8f136214027c83f34510b120fb95935d05a47da298ce712bf3c17c446d7cb21cfd030d842cec32eba674c17
-  data.tar.gz: 096d695b938cd6b57bda2f1a931093fcb4dbf5666e31066a9d5c0204afd15f340b33df2b505e3fbd3bb62cbcaa738e56944def859b8ef87160e372cfcbe65500
+  metadata.gz: 3bc0dcc8cc7273893a1c8448abbe35beaf6f949ce9878ac6037448b4cd0f38f2139b709b1bfa59dce0eb4b689429aeb29aabf04e6a4f7220c3fb787a7ba53073
+  data.tar.gz: d8b17cb0c8932865fe531182cc42a979218c410911201f51249b5d7c260753848a62f64655e9b1eba60fb449adefa8a3573f12543e11899b8e4b4b66ed7aae4a

data/.rubocop.yml

@@ -1,3 +1,3 @@
 inherit_from:
- - rubocop-todo.yml
- - .rubocop_cocoapods.yml
+  - .rubocop_todo.yml
+  - .rubocop_cocoapods.yml

data/.rubocop_cocoapods.yml

@@ -5,6 +5,7 @@ AllCops:
     - ./*.gemspec
   Exclude:
     - ./spec/fixtures/**/*
+    - ./vendor/bundle/**/*
 
 # At the moment not ready to be used
 # https://github.com/bbatsov/rubocop/issues/947
@@ -58,6 +59,16 @@ Next:
 Metrics/ClassLength:
   Enabled: false
 
+# Arbitrary max lengths for modules simply do not work and enabling this will
+# lead to a never ending stream of annoyance and changes.
+Metrics/ModuleLength:
+  Enabled: false
+
+# Arbitrary max lengths for methods simply do not work and enabling this will
+# lead to a never ending stream of annoyance and changes.
+Metrics/MethodLength:
+  Enabled: false
+
 # No enforced convention here.
 Metrics/BlockNesting:
   Enabled: false
@@ -108,4 +119,3 @@ ClassAndModuleChildren:
 UselessComparison:
   Exclude:
     - spec/**/*
-

data/.rubocop_todo.yml

@@ -0,0 +1,12 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-14 22:12:21 -0700 using RuboCop version 0.33.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 20
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 108

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Cocoapods::Try Changelog
 
-## 0.4.5
+## 0.5.0 (2015-08-26)
+
+##### Enhancements
+
+* Any CocoaPod / GitHub repo can now declare their own pre-install commands, and prefer a
+  project. To use this, add a `.cocoapods.yml` file to the root of your repo. The yaml file
+  should have a structure like:
+
+  ``` yaml
+  try:
+    install:
+      pre:
+        - pod install
+        - git submodule init
+    project: 'ORStackView.xcworkspace'
+  ```
+
+  [Orta Therox](https://github.com/orta)
+  [#33](https://github.com/CocoaPods/cocoapods-try/issues/33)
+
+
+## 0.4.5 (2015-05-27)
 
 ##### Bug Fixes
 
@@ -13,7 +34,7 @@
   [#35](https://github.com/CocoaPods/cocoapods-try/issues/35)
 
 
-## 0.4.4
+## 0.4.4 (2015-05-06)
 
 ##### Bug Fixes
 
@@ -22,7 +43,7 @@
   [#30](https://github.com/CocoaPods/cocoapods-try/issues/30)
 
 
-## 0.4.3
+## 0.4.3 (2014-12-25)
 
 ##### Bug Fixes
 
@@ -30,31 +51,31 @@
   [Daniel Tomlinson](https://github.com/DanielTomlinson)
   [CocoaPods/CocoaPods#2563](https://github.com/CocoaPods/CocoaPods/pull/2563)
 
-## 0.4.2
+## 0.4.2 (2014-10-29)
 
 * Prefer projects or workspaces with the name including Sample over others.  
   [Kyle Fuller](https://github.com/kylef)
 
-## 0.4.1
+## 0.4.1 (2014-09-26)
 
 * Add `--no-repo-update` option.  
   [Eloy Durán](https://github.com/alloy)
 
-## 0.4.0
+## 0.4.0 (2014-09-11)
 
 ### Enhancements
 
 * Adopted new argument format of CLAide.  
   [Olivier Halligon](https://github.com/AliSoftware)
 
-## 0.3.0
+## 0.3.0 (2014-05-19)
 
 ### Enhancements
 
 * Adopted new CLAide release.  
   [Fabio Pelosin](https://github.com/irrationalfab)
 
-## 0.2.0
+## 0.2.0 (2014-03-28)
 
 ### Enhancements
 
@@ -80,7 +101,7 @@
 * Typo fixes.  
   [Mark Townsend](https://github.com/markltownsend)
 
-## 0.1.0
+## 0.1.0 (2013-12-02)
 
 * Initial implementation.  
   [Fabio Pelosin](https://github.com/fabiopelosin)

data/Gemfile.lock

@@ -1,35 +1,36 @@
 GIT
   remote: https://github.com/CocoaPods/CLAide.git
-  revision: f75b6d84d898a0a61f87bd48bab87d794a91ee86
+  revision: 675dd608cd5b3f8b62a4f34da48aff5d0b75d41f
   branch: master
   specs:
-    claide (0.8.1)
+    claide (0.9.1)
 
 GIT
   remote: https://github.com/CocoaPods/CocoaPods.git
-  revision: 3bb44003adb274d89a180dc222999c3fc1e8336b
+  revision: b8f6bd87e2897a38511cff9192f3f72c410dc34b
   branch: master
   specs:
-    cocoapods (0.37.0)
+    cocoapods (0.38.2)
       activesupport (>= 3.2.15)
-      claide (~> 0.8.1)
-      cocoapods-core (= 0.37.0)
-      cocoapods-downloader (~> 0.9.0)
+      claide (~> 0.9.1)
+      cocoapods-core (= 0.38.2)
+      cocoapods-downloader (~> 0.9.1)
       cocoapods-plugins (~> 0.4.2)
-      cocoapods-trunk (~> 0.6.0)
-      cocoapods-try (~> 0.4.3)
+      cocoapods-stats (~> 0.5.3)
+      cocoapods-trunk (~> 0.6.1)
+      cocoapods-try (~> 0.5.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.2.3)
+      molinillo (~> 0.3.1)
       nap (~> 0.8)
-      xcodeproj (~> 0.24.1)
+      xcodeproj (~> 0.26.3)
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 493e5d33f79213eaf89588575289071baca9444b
+  revision: ee3a58cb516034942b684469a3b2766a8004b49b
   branch: master
   specs:
-    cocoapods-core (0.37.0)
+    cocoapods-core (0.38.2)
       activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       nap (~> 0.8.0)
@@ -37,25 +38,27 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-try (0.4.5)
+    cocoapods-try (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     bacon (1.2.0)
-    cocoapods-downloader (0.9.0)
+    cocoapods-downloader (0.9.1)
     cocoapods-plugins (0.4.2)
       nap
-    cocoapods-trunk (0.6.0)
+    cocoapods-stats (0.5.3)
+      nap (~> 0.8)
+    cocoapods-trunk (0.6.1)
       nap (>= 0.8)
       netrc (= 0.7.8)
     codeclimate-test-reporter (0.4.7)
@@ -65,41 +68,41 @@ GEM
     escape (0.0.4)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.6.1)
+    minitest (5.8.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)
       mocha (>= 0.13.0)
-    molinillo (0.2.3)
-    multi_json (1.11.0)
+    molinillo (0.3.1)
     nap (0.8.0)
     netrc (0.7.8)
-    parser (2.2.0.3)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
+    powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     rainbow (2.0.0)
     rake (10.4.2)
-    rubocop (0.29.1)
+    rubocop (0.33.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
+      parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
-    simplecov (0.9.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.24.1)
+    xcodeproj (0.26.3)
       activesupport (>= 3)
+      claide (~> 0.9.1)
       colored (~> 1.2)
 
 PLATFORMS
@@ -118,3 +121,6 @@ DEPENDENCIES
   prettybacon
   rake
   rubocop
+
+BUNDLED WITH
+   1.10.6

data/lib/cocoapods_try.rb

@@ -2,5 +2,5 @@
 # The namespace of the Cocoapods try plugin.
 #
 module CocoapodsTry
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

data/lib/pod/command/try.rb

@@ -1,3 +1,4 @@
+require 'pod/try_settings'
 
 # The CocoaPods namespace
 #
@@ -36,17 +37,13 @@ module Pod
       def run
         ensure_master_spec_repo_exists!
         sandbox = Sandbox.new(TRY_TMP_DIR)
-        if git_url?(@name)
-          spec = spec_with_url(@name)
-          sandbox.store_pre_downloaded_pod(spec.name)
-        else
-          update_specs_repos
-          spec = spec_with_name(@name)
-        end
+        spec = setup_spec_in_sandbox(sandbox)
 
         UI.title "Trying #{spec.name}" do
           pod_dir = install_pod(spec, sandbox)
-          proj = pick_demo_project(pod_dir)
+          settings = TrySettings.settings_from_folder(pod_dir)
+          settings.run_pre_install_commands(true)
+          proj = settings.project_path || pick_demo_project(pod_dir)
           file = install_podfile(proj)
           if file
             open_project(file)
@@ -65,6 +62,19 @@ module Pod
       #
       TRY_TMP_DIR = Pathname.new(Dir.tmpdir) + 'CocoaPods/Try'
 
+      # Puts the spec's data in the sandbox
+      #
+      def setup_spec_in_sandbox(sandbox)
+        if git_url?(@name)
+          spec = spec_with_url(@name)
+          sandbox.store_pre_downloaded_pod(spec.name)
+        else
+          update_specs_repos
+          spec = spec_with_name(@name)
+        end
+        spec
+      end
+
       # Returns the specification of the last version of the Pod with the given
       # name.
       #
@@ -97,7 +107,7 @@ module Pod
         target_dir = TRY_TMP_DIR + name
         target_dir.rmtree if target_dir.exist?
 
-        downloader = Pod::Downloader.for_target(target_dir,  :git => url)
+        downloader = Pod::Downloader.for_target(target_dir, :git => url)
         downloader.download
 
         spec_file = Pathname.glob(target_dir + "#{name}.podspec{,.json}").first
@@ -150,7 +160,7 @@ module Pod
           selection_array = projs.map do |p|
             Pathname.new(p).relative_path_from(dir).to_s
           end
-          index = choose_from_array(selection_array, message)
+          index = UI.choose_from_array(selection_array, message)
           projs[index]
         end
       end
@@ -212,32 +222,6 @@ module Pod
         `open "#{path}"`
       end
 
-      # Presents a choice among the elements of an array to the user.
-      #
-      # @param  [Array<#to_s>] array
-      #         The list of the elements among which the user should make his
-      #         choice.
-      #
-      # @param  [String] message
-      #         The message to display to the user.
-      #
-      # @return [Fixnum] The index of the chosen array item.
-      #
-      # @todo   This method was duplicated from the spec subcommands
-      #
-      def choose_from_array(array, message)
-        array.each_with_index do |item, index|
-          UI.puts "#{ index + 1 }: #{ item }"
-        end
-        UI.puts "#{message} [1-#{array.count}]?"
-        index = STDIN.gets.chomp.to_i - 1
-        if index < 0 || index > array.count
-          raise Informative, "#{ index + 1 } is invalid [1-#{array.count}]"
-        else
-          index
-        end
-      end
-
       # @return [void] Performs a CocoaPods installation in the working
       #         directory.
       #

data/lib/pod/try_settings.rb

@@ -0,0 +1,53 @@
+module Pod
+  class TrySettings
+    attr_accessor :pre_install_commands, :project_path
+
+    # Creates a TrySettings instance based on a folder path
+    #
+    def self.settings_from_folder(path)
+      settings_path = Pathname.new(path) + '.cocoapods.yml'
+      return TrySettings.new unless File.exist? settings_path
+
+      settings = YAMLHelper.load_file(settings_path)
+      try_settings = TrySettings.new
+      return try_settings unless settings['try']
+
+      if settings['try']['install']
+        try_settings.pre_install_commands = Array(settings['try']['install']['pre'])
+      end
+
+      if settings['try']['project']
+        try_settings.project_path = Pathname.new(path) + settings['try']['project']
+      end
+
+      try_settings
+    end
+
+    # If we need to run commands from pod-try we should let the users know
+    # what is going to be running on their device.
+    #
+    def prompt_for_permission
+      UI.titled_section 'Running Pre-Install Commands' do
+        commands = pre_install_commands.length > 1 ? 'commands' : 'command'
+        UI.puts "In order to try this pod, CocoaPods-Try needs to run the following #{commands}:"
+        pre_install_commands.each { |command| UI.puts " - #{command}" }
+        UI.puts "\nPress return to run these #{commands}, or press `ctrl + c` to stop trying this pod."
+      end
+
+      # Give an elegant exit point.
+      UI.gets.chomp
+    end
+
+    # Runs the pre_install_commands from
+    #
+    # @param  [Bool] prompt
+    #         Should CocoaPods-Try show a prompt with the commands to the user.
+    #
+    def run_pre_install_commands(prompt)
+      if pre_install_commands
+        prompt_for_permission if prompt
+        pre_install_commands.each { |command| Executable.execute_command('bash', ['-e', command], true) }
+      end
+    end
+  end
+end

data/spec/command/try_settings_spec.rb

@@ -0,0 +1,105 @@
+require 'tmpdir'
+require File.expand_path('../../spec_helper', __FILE__)
+
+# The CocoaPods namespace
+#
+module Pod
+  describe TrySettings do
+    it 'returns an instance with empty defaults when there are no yml settings files' do
+      Dir.mktmpdir do |dir|
+        settings = TrySettings.settings_from_folder dir
+        settings.should.be.instance_of TrySettings
+        settings.pre_install_commands.should.be.nil?
+        settings.project_path.should.be.nil?
+      end
+    end
+
+    it 'returns an instance with the right defaults when there are no yml settings files' do
+      Dir.mktmpdir do |dir|
+        yaml = <<YAML
+          try:
+            install:
+              pre:
+                - pod install
+                - git submodule init
+            project: 'ORStackView.xcworkspace'
+YAML
+        File.open(dir + '/.cocoapods.yml', 'w') { |f| f.write(yaml) }
+
+        settings = TrySettings.settings_from_folder dir
+        settings.should.be.instance_of TrySettings
+        settings.pre_install_commands.should == ['pod install', 'git submodule init']
+        settings.project_path.should == Pathname.new(dir) + 'ORStackView.xcworkspace'
+      end
+    end
+
+    it 'converts a string for the pre_install hook to a single object array' do
+      Dir.mktmpdir do |dir|
+        yaml = <<YAML
+          try:
+            install:
+              pre: pod install
+YAML
+        File.open(dir + '/.cocoapods.yml', 'w') { |f| f.write(yaml) }
+
+        settings = TrySettings.settings_from_folder dir
+        settings.should.be.instance_of TrySettings
+        settings.pre_install_commands.should == ['pod install']
+      end
+    end
+
+    it 'handles running commands in the pre-install' do
+      Dir.mktmpdir do |dir|
+        yaml = <<YAML
+          try:
+            install:
+              pre:
+                - pod install
+                - git submodule init
+YAML
+        File.open(dir + '/.cocoapods.yml', 'w') { |f| f.write(yaml) }
+
+        Executable.expects(:execute_command).with('bash', ['-e', 'pod install'], true)
+        Executable.expects(:execute_command).with('bash', ['-e', 'git submodule init'], true)
+
+        settings = TrySettings.settings_from_folder dir
+        settings.run_pre_install_commands false
+      end
+    end
+
+    it 'handles not including system commands in the pre-install' do
+      Dir.mktmpdir do |dir|
+        yaml = <<YAML
+          try:
+            project: 'ORStackView.xcworkspace'
+YAML
+        File.open(dir + '/.cocoapods.yml', 'w') { |f| f.write(yaml) }
+
+        settings = TrySettings.settings_from_folder dir
+        settings.project_path.should == Pathname.new(dir) + 'ORStackView.xcworkspace'
+      end
+    end
+
+    it 'handles not including the try in the yaml' do
+      Dir.mktmpdir do |dir|
+        yaml = <<YAML
+          thing: "other"
+YAML
+        File.open(dir + '/.cocoapods.yml', 'w') { |f| f.write(yaml) }
+
+        settings = TrySettings.settings_from_folder dir
+        settings.pre_install_commands.should.be.nil?
+        settings.project_path.should.be.nil?
+      end
+    end
+
+    it 'does not show a prompt with no pre_install commands' do
+      Dir.mktmpdir do |dir|
+        TrySettings.any_instance.expects(:prompt_for_permission).never
+
+        settings = TrySettings.settings_from_folder dir
+        settings.run_pre_install_commands true
+      end
+    end
+  end
+end

data/spec/command/try_spec.rb

@@ -119,7 +119,7 @@ module Pod
         it 'asks the user which project would like to open if not a single suitable one is found' do
           projects = ['Lib_1.xcodeproj', 'Lib_2.xcodeproj']
           Dir.stubs(:glob).returns(projects)
-          @sut.stubs(:choose_from_array).returns(0)
+          UI.stubs(:choose_from_array).returns(0)
           path = @sut.pick_demo_project(stub(:cleanpath => ''))
           path.should == 'Lib_1.xcodeproj'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-try
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Pelosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ files:
 - .gitignore
 - .rubocop.yml
 - .rubocop_cocoapods.yml
+- .rubocop_todo.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -58,7 +59,8 @@ files:
 - lib/cocoapods_plugin.rb
 - lib/cocoapods_try.rb
 - lib/pod/command/try.rb
-- rubocop-todo.yml
+- lib/pod/try_settings.rb
+- spec/command/try_settings_spec.rb
 - spec/command/try_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cocoapods/cocoapods-try
@@ -81,10 +83,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin which allows to quickly try the demo project of a Pod.
 test_files:
+- spec/command/try_settings_spec.rb
 - spec/command/try_spec.rb
 - spec/spec_helper.rb

data/rubocop-todo.yml

@@ -1,24 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-05-19 20:21:03 +0200 using RuboCop version 0.21.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-ClassLength:
-  Max: 148
-
-# Offense count: 11
-LineLength:
-  Max: 108
-
-# Offense count: 3
-# Configuration parameters: CountComments.
-MethodLength:
-  Max: 20
-
-# Offense count: 1
-UnusedBlockArgument:
-  Enabled: false