Merge pull request #56 from asmallteapot/asmallteapot/updates

update project

.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop/require_tools
+
 Metrics/LineLength:
   Max: 130
 
@@ -7,11 +9,8 @@ Style/Documentation:
     - 'test/**/*'
     - 'bin/carthage-play'
     - 'bin/playground'
-    - 'lib/cocoapods-playgrounds/generate.rb'
-    - 'lib/cocoapods-playgrounds/workspace.rb'
-    - 'lib/cocoapods-playgrounds/command/playgrounds.rb'
 
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'lib/cocoapods-playgrounds.rb'
 

.ruby-version

@@ -0,0 +1 @@
+2.5.1

.travis.yml

@@ -1,10 +1,8 @@
 os: osx
-osx_image: xcode7.2
-language: objective-c
-#language: ruby
-rvm: 2.0.0-p598
+osx_image: xcode9.4
+language: ruby
 cache: bundler
-before_install: gem install bundler
 script:
   - bundle exec rake specs
   - bundle exec rake rubocop
+

Gemfile

@@ -1,13 +1,21 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-group :development do
-  gem 'cocoapods'
+gem 'cocoapods', '~> 1.5.3'
 
-  gem 'mocha'
-  gem 'bacon'
-  gem 'mocha-on-bacon'
-  gem 'prettybacon'
-  gem 'rubocop'
+group :development do
+  gem 'bacon', '~> 1.2.0'
+  gem 'guard'
+  gem 'guard-bundler'
+  gem 'guard-rake'
+  gem 'guard-rubocop'
+  gem 'mocha', '~> 1.6.0'
+  gem 'mocha-on-bacon', '~> 0.2.3'
+  gem 'prettybacon', '~> 0.0.2'
+  gem 'rubocop', '~> 0.58.2'
+  gem 'rubocop-require_tools'
+  gem 'terminal-notifier-guard', '~> 1.6.1'
 end

Gemfile.lock

@@ -7,97 +7,161 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    CFPropertyList (3.0.0)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ast (2.2.0)
+    ast (2.4.0)
+    atomos (0.1.2)
     bacon (1.2.0)
-    claide (1.0.0)
-    cocoapods (1.0.0)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0, < 2.0)
-      cocoapods-core (= 1.0.0)
-      cocoapods-deintegrate (>= 1.0.0, < 2.0)
-      cocoapods-downloader (>= 1.0.0, < 2.0)
+    claide (1.0.2)
+    cocoapods (1.5.3)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.5.3)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.0.0, < 2.0)
-      cocoapods-try (>= 1.0.0, < 2.0)
-      colored (~> 1.2)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 2.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
-      xcodeproj (>= 1.0.0, < 2.0)
-    cocoapods-core (1.0.0)
-      activesupport (>= 4.0.2)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.3)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.0)
-    cocoapods-downloader (1.0.0)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.0.0)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
-    cocoapods-try (1.0.0)
-    colored (1.2)
+      netrc (~> 0.11)
+    cocoapods-try (1.1.0)
+    coderay (1.1.2)
+    colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
     escape (0.0.4)
-    fourflusher (0.3.0)
+    ffi (1.9.25)
+    formatador (0.2.5)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    i18n (0.7.0)
-    json (1.8.3)
+    gh_inspector (1.1.3)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.1.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rake (1.0.0)
+      guard
+      rake
+    guard-rubocop (1.3.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.13)
     metaclass (0.0.4)
-    minitest (5.8.4)
-    mocha (1.1.0)
+    method_source (0.9.0)
+    minitest (5.11.3)
+    mocha (1.6.0)
       metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.2)
+    mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
-    molinillo (0.4.5)
+    molinillo (0.6.5)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    netrc (0.7.8)
-    parser (2.3.0.5)
-      ast (~> 2.2)
-    powerpack (0.1.1)
+    nenv (0.3.0)
+    netrc (0.11.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    rubocop (0.37.2)
-      parser (>= 2.3.0.4, < 3.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rubocop (0.58.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 0.3)
-    ruby-progressbar (1.7.5)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-require_tools (0.1.2)
+      rubocop (>= 0.49.1)
+    ruby-macho (1.2.0)
+    ruby-progressbar (1.9.0)
+    ruby_dep (1.5.0)
+    shellany (0.0.1)
+    terminal-notifier-guard (1.6.4)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (0.3.1)
-    xcodeproj (1.0.0)
-      activesupport (>= 3)
-      claide (>= 1.0.0, < 2.0)
-      colored (~> 1.2)
+    unicode-display_width (1.4.0)
+    xcodeproj (1.5.9)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bacon
+  bacon (~> 1.2.0)
   bundler (~> 1.3)
-  cocoapods
+  cocoapods (~> 1.5.3)
   cocoapods-playgrounds!
-  mocha
-  mocha-on-bacon
-  prettybacon
+  guard
+  guard-bundler
+  guard-rake
+  guard-rubocop
+  mocha (~> 1.6.0)
+  mocha-on-bacon (~> 0.2.3)
+  prettybacon (~> 0.0.2)
   rake
-  rubocop
+  rubocop (~> 0.58.2)
+  rubocop-require_tools
+  terminal-notifier-guard (~> 1.6.1)
 
 BUNDLED WITH
-   1.12.5
+   1.16.3

Guardfile

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end
+
+guard :rubocop do
+  watch(/.+\.rb$/)
+  watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+if `uname`.match?(/Darwin/)
+  notification :terminal_notifier,
+               app_name: 'cocoapods-playgrounds',
+               activate: 'com.googlecode.iTerm2'
+end

README.md

@@ -1,6 +1,5 @@
 # This Could Be Us But You Playing
 
-[![No Maintenance Intended](http://unmaintained.tech/badge.svg)](http://unmaintained.tech/)
 [![Build Status](https://img.shields.io/travis/segiddins/ThisCouldBeUsButYouPlaying/master.svg?style=flat)](https://travis-ci.org/segiddins/ThisCouldBeUsButYouPlaying)
 
 ![](README_images/alamofire.png)

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
 

bin/carthage-play

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if $PROGRAM_NAME == __FILE__
-  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __dir__)
   require 'rubygems'
   require 'bundler/setup'
-  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+  $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 end
 
 require 'claide'
 require 'cocoapods-playgrounds/gem_version'
-require 'cocoapods-playgrounds/workspace'
+require 'cocoapods-playgrounds/generate/workspace/carthage'
 
 class PlainInformative < StandardError
   include CLAide::InformativeError
@@ -38,7 +39,7 @@ class Command < CLAide::Command
   end
 
   def run
-    generator = Pod::WorkspaceGenerator.new([@name], :carthage)
+    generator = Pod::CarthageGenerator.new(dependencies: [@name])
     generator.generate
   end
 end

bin/playground

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if $PROGRAM_NAME == __FILE__
-  ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__)
+  ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __dir__)
   require 'rubygems'
   require 'bundler/setup'
-  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+  $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 end
 
 require 'claide'
-require 'cocoapods-playgrounds/generate'
+require 'cocoapods-playgrounds/command/playgrounds'
 require 'cocoapods-playgrounds/gem_version'
+require 'cocoapods-playgrounds/generate/playground'
 
 class PlainInformative < StandardError
   include CLAide::InformativeError

cocoapods-playgrounds.gemspec

@@ -1,15 +1,16 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cocoapods-playgrounds/gem_version.rb'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cocoapods-playgrounds'
   spec.version       = CocoapodsPlaygrounds::VERSION
-  spec.authors       = ['Boris Bügling']
-  spec.email         = ['boris@icculus.org']
+  spec.authors       = ['Boris Bügling', 'Ellen Teapot']
+  spec.email         = ['boris@icculus.org', 'hi@asmallteapot.com']
   spec.summary       = 'Generates a Swift Playground for any Pod.'
-  spec.homepage      = 'https://github.com/neonichu/ThisCouldBeUsButYouPlaying'
+  spec.homepage      = 'https://github.com/asmallteapot/cocoapods-playgrounds'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)

lib/cocoapods-playgrounds.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'cocoapods-playgrounds/gem_version'