cocoapods-trunk 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367df1c17f4cbcd0bb02a075f36ec7ae0968ecf3
-  data.tar.gz: fbe3b697376e192c759901060ab3250e55dcd394
+  metadata.gz: 035d0047401ad8b12f4e62d3f123cb1caed00d3e
+  data.tar.gz: c55831d514d345734253955005e21b4626bf5465
 SHA512:
-  metadata.gz: c2df7ac3367353cbf9f1ade495ee5321cc4360a47be6f374f89d8e21def4a135557bb646be552e7533ffd0e2bc0523767786586be078e6e3c957c444fd6abffe
-  data.tar.gz: 62f1bba5c95b986177a9eb6e65fbd8d5f568ef90b7a15f7c344b5b0b65df76c6ba5be06fab87e59959d13853ad044fe04c3e5cfc1f9a0f4d819c3c9fd515a76c
+  metadata.gz: 07e34200a2c9e83c1d95b48980e5acf4af3819e2d0573dacbe5e3836fcf68252454aa3bee3a743cfdb0b1e502de3cca792ff28808338e785b739f203fab3503b
+  data.tar.gz: ede3bc0ff8d470205f194f93a2e8f79655f1ed4d746f18644e1839678af7f826f6e77cfd9f3e3f6b66670ea6601082129f9dfb153d363b1e5761e19fec542816

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.kick

@@ -0,0 +1,29 @@
+recipe :ruby
+
+Kicker::Recipes::Ruby.runner_bin = 'bacon --quiet'
+
+process do |files|
+  specs = files.take_and_map do |file|
+    if file =~ %r{lib/(.+?)\.rb$}
+      s = Dir.glob("spec/**/#{File.basename(file, '.rb')}_spec.rb")
+      s.uniq unless s.empty?
+    end
+  end
+  Kicker::Recipes::Ruby.run_tests(specs)
+end
+
+# Have written this so many times, probably should make a recipe out of it.
+process do |files|
+  files.each do |file|
+    case file
+    when 'Gemfile'
+      files.delete(file)
+      execute 'bundle install'
+    end
+  end
+end
+
+recipe :ignore
+ignore(/.*\/?tags/)
+ignore(/.*\/?\.git/)
+

data/.travis.yml

@@ -5,6 +5,10 @@ env:
   - RVM_RUBY_VERSION=2.0.0-p247 NOEXEC_DISABLE=1 RUBY_VERSION_SPECIFIC='sudo gem install bundler --no-ri --no-rdoc' GIT_AUTHOR_NAME=CocoaPods GIT_AUTHOR_EMAIL=cocoapods@example.com PYTHONPATH=/usr/local/lib/python2.7/site-packages
 before_install:
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - source ~/.rvm/scripts/rvm && rvm use $RVM_RUBY_VERSION
-install: eval $RUBY_VERSION_SPECIFIC && rake bootstrap[use_bundle_dir]
-script: bundle exec rake specs
+  - source ~/.rvm/scripts/rvm
+  - if [[ $RVM_RUBY_VERSION != 'system' ]]; then rvm install $RVM_RUBY_VERSION; fi
+  - rvm use $RVM_RUBY_VERSION
+  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then export ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future; fi
+  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem install bundler --no-ri --no-rdoc; else gem install bundler --no-ri --no-rdoc; fi
+install: eval $RUBY_VERSION_SPECIFIC && bundle install --path ./travis_bundle_dir
+script: bundle exec rake spec

data/Gemfile

@@ -8,6 +8,8 @@ group :development do
   gem 'bacon'
   gem 'mocha-on-bacon'
   gem 'mocha', '~> 0.11.4'
+  gem 'psych' # Needed by Mocha
   gem 'prettybacon'
+  gem 'kicker'
 end
 

data/Gemfile.lock

@@ -0,0 +1,89 @@
+PATH
+  remote: .
+  specs:
+    cocoapods-trunk (0.1.4)
+      json_pure (~> 1.8)
+      nap (>= 0.6)
+      netrc
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    bacon (1.2.0)
+    claide (0.6.1)
+    cocoapods (0.33.1)
+      activesupport (>= 3.2.15, < 4)
+      claide (~> 0.6.1)
+      cocoapods-core (= 0.33.1)
+      cocoapods-downloader (~> 0.6.1)
+      cocoapods-plugins (~> 0.2.0)
+      cocoapods-trunk (~> 0.1.1)
+      cocoapods-try (~> 0.3.0)
+      colored (~> 1.2)
+      escape (~> 0.0.4)
+      json_pure (~> 1.8)
+      nap (~> 0.7)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.17.0)
+    cocoapods-core (0.33.1)
+      activesupport (>= 3.2.15)
+      fuzzy_match (~> 2.0.4)
+      json_pure (~> 1.8)
+      nap (~> 0.5)
+    cocoapods-downloader (0.6.1)
+    cocoapods-plugins (0.2.0)
+      nap
+    cocoapods-try (0.3.0)
+    colored (1.2)
+    escape (0.0.4)
+    ffi (1.9.3)
+    fuzzy_match (2.0.4)
+    i18n (0.6.9)
+    json_pure (1.8.1)
+    kicker (3.0.0)
+      listen (~> 1.3.0)
+      notify (~> 0.5.2)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    metaclass (0.0.4)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    mocha-on-bacon (0.2.1)
+      mocha (>= 0.9.8)
+    multi_json (1.10.1)
+    nap (0.8.0)
+    netrc (0.7.7)
+    notify (0.5.2)
+    open4 (1.3.4)
+    prettybacon (0.0.2)
+      bacon (~> 1.2)
+    psych (2.0.5)
+    rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    xcodeproj (0.17.0)
+      activesupport (~> 3.0)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bacon
+  bundler (~> 1.3)
+  cocoapods
+  cocoapods-trunk!
+  kicker
+  mocha (~> 0.11.4)
+  mocha-on-bacon
+  prettybacon
+  psych
+  rake

data/README.md

@@ -1,6 +1,6 @@
 # Cocoapods::Trunk
 
-[![Build Status](https://travis-ci.org/CocoaPods/cocoapods-trunk.svg)](https://travis-ci.org/CocoaPods/cocoapods-trunk)
+[![Build Status](http://img.shields.io/travis/CocoaPods/cocoapods-trunk/master.svg?style=flat)](https://travis-ci.org/CocoaPods/cocoapods-trunk)
 
 CocoaPods plugin for trunk.
 

data/Rakefile

@@ -1,13 +1,52 @@
-require "bundler/gem_tasks"
+# encoding: utf-8
 
-def specs(dir)
-  FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
+#-- Bootstrap --------------------------------------------------------------#
+
+desc 'Initializes your working copy to run the specs'
+task :bootstrap do
+  if system('which bundle')
+    title 'Installing gems'
+    sh 'bundle install'
+  else
+    $stderr.puts "\033[0;31m" \
+      "[!] Please install the bundler gem manually:\n" \
+      '    $ [sudo] gem install bundler'
+      "\e[0m"
+    exit 1
+  end
 end
 
-desc "Runs all the specs"
-task :specs do
-  sh "bundle exec bacon #{specs('**')}"
+begin
+  require "bundler/gem_tasks"
+  task :default => :spec
+
+  desc 'Runs all the specs'
+  task :spec do
+    title 'Running Unit Tests'
+    files = FileList['spec/**/*_spec.rb'].shuffle.join(' ')
+    sh "bundle exec bacon #{files}"
+  end
+
+  desc 'Automatically run specs for updated files'
+  task :kick do
+    exec 'bundle exec kicker -c'
+  end
+
+rescue LoadError
+  $stderr.puts "\033[0;31m" \
+    '[!] Some Rake tasks haven been disabled because the environment' \
+    ' couldn’t be loaded. Be sure to run `rake bootstrap` first.' \
+    "\e[0m"
 end
 
-task :default => :specs
+#-- Helpers ------------------------------------------------------------------#
+
+def title(title)
+  cyan_title = "\033[0;36m#{title}\033[0m"
+  puts
+  puts '-' * 80
+  puts cyan_title
+  puts '-' * 80
+  puts
+end
 

data/lib/pod/command/trunk.rb

@@ -98,12 +98,18 @@ module Pod
         end
 
         def run
-          json = json(request_path(:get, "sessions", auth_headers))
-          UI.labeled 'Name', json['name']
-          UI.labeled 'Email', json['email']
-          UI.labeled 'Since', formatted_time(json['created_at'])
-
-          sessions = json['sessions'].map do |session|
+          me = json(request_path(:get, "sessions", auth_headers))
+          owner = json(request_path(:get, "owners/#{me['email']}"))
+          UI.labeled 'Name', owner['name']
+          UI.labeled 'Email', owner['email']
+          UI.labeled 'Since', formatted_time(owner['created_at'])
+
+          pods = owner['pods'] || []
+          pods = pods.map { |pod| pod['name'] }
+          pods = 'None' unless pods.any?
+          UI.labeled 'Pods', pods
+
+          sessions = me['sessions'].map do |session|
             hash = {
               :created_at => formatted_time(session['created_at']),
               :valid_until => formatted_time(session['valid_until']),
@@ -216,8 +222,9 @@ module Pod
       class Push < Trunk
         self.summary = 'Publish a podspec'
         self.description = <<-DESC
-          By publishing a podspec you make this available to all users of the
-          ‘master’ spec-repo.
+          Publish the podspec at `PATH` to make it available to all users of
+          the ‘master’ spec-repo. If `PATH` is not provided, defaults to the
+          current directory.
 
           Before pushing the podspec to cocoapods.org, this will perform a local
           lint of the podspec, including a build of the library. However, it
@@ -242,7 +249,8 @@ module Pod
 
         def initialize(argv)
           @allow_warnings = argv.flag?('allow-warnings')
-          @path = argv.shift_argument
+          @path = argv.shift_argument || '.'
+          find_podspec_file if File.directory?(@path)
           super
         end
 
@@ -252,16 +260,16 @@ module Pod
             help! 'You need to register a session first.'
           end
           unless @path
-            help! 'Specify the path to the podspec file.'
+            help! 'Please specify the path to the podspec file.'
           end
           unless File.exist?(@path) && !File.directory?(@path)
-            help! 'No podspec found at the specified path.'
+            help! "The specified path `#{@path}` does not point to " \
+              'an existing podspec file.'
           end
         end
 
         def run
           validate_podspec
-
           response = request_path(:post, "pods", spec.to_json, auth_headers)
           url = response.headers['location'].first
           json = json(request_url(:get, url, default_headers))
@@ -279,6 +287,20 @@ module Pod
 
         private
 
+        def find_podspec_file
+          podspecs = Dir[Pathname(@path) + '*.podspec{.json,}']
+          case podspecs.count
+          when 0
+            UI.notice "No podspec found in directory `#{@path}`"
+          when 1
+            UI.notice "Found podspec `#{podspecs[0]}`"
+          else
+            UI.notice "Multiple podspec files in directory `#{@path}`. " \
+              'You need to explicitly specify which one to use.'
+          end
+          @path = (podspecs.count == 1) ? podspecs[0] : nil
+        end
+
         def spec
           @spec ||= Pod::Specification.from_file(@path)
         rescue Informative # TODO: this should be a more specific error

data/lib/trunk/version.rb

@@ -1,5 +1,5 @@
 module Cocoapods
   module Trunk
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/spec/command/trunk/push_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require 'tmpdir'
 
 module Pod
   describe Command::Trunk::Push do
@@ -7,6 +8,53 @@ module Pod
         Command.parse(%w{ trunk push }).should.be.instance_of Command::Trunk::Push
       end
     end
+
+    describe 'PATH' do
+      before {
+        UI.output = ''
+      }
+      it 'defaults to the current directory' do
+        # Disable the podspec finding algorithm so we can check the raw path
+        Command::Trunk::Push.any_instance.stubs(:find_podspec_file) { |path| path }
+        command = Command.parse(%w{ trunk push })
+        command.instance_eval { @path }.should == '.'
+      end
+
+      def found_podspec_among_files(files)
+        # Create a temp directory with the dummy `files` in it
+        Dir.mktmpdir do |dir|
+          files.each do |filename|
+            path = Pathname(dir) + filename
+            File.open(path, 'w') { }
+          end
+          # Execute `pod trunk push` with this dir as parameter
+          command = Command.parse(%w{ trunk push } + [dir])
+          path = command.instance_eval { @path }
+          return path ? File.basename(path) : nil
+        end
+      end
+
+      it 'should find the only JSON podspec in a given directory' do
+        files = %w(foo bar.podspec.json baz)
+        found_podspec_among_files(files).should == files[1]
+      end
+
+      it 'should find the only Ruby podspec in a given directory' do
+        files = %w(foo bar.podspec baz)
+        found_podspec_among_files(files).should == files[1]
+      end
+
+      it 'should warn when no podspec found in a given directory' do
+        files = %w(foo bar baz)
+        found_podspec_among_files(files).should == nil
+        UI.output.should.match /No podspec found in directory/
+      end
+
+      it 'should warn when multiple podspecs found in a given directory' do
+        files = %w(foo bar.podspec bar.podspec.json baz)
+        found_podspec_among_files(files).should == nil
+        UI.output.should.match /Multiple podspec files in directory/
+      end
+    end
   end
 end
-

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-trunk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eloy Durán
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -87,9 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".kick"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -114,12 +116,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -135,4 +137,3 @@ test_files:
 - spec/command/trunk/register_spec.rb
 - spec/command/trunk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: