shortlook 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c80f9a3656b9afa52637aa533f375ae98afc3fdd5523163a0d6600e06029e678
-  data.tar.gz: c369f376db957ea802c7f6f1905601a7e167b1449438db93a63d928d8369142e
+  metadata.gz: 7d34939d08e248583825eb0913f975ffa0e76a86810680fc5b96d633cc22963b
+  data.tar.gz: 91be8b30834987830ed031242b990eaf9f535e6eceb0c059cd93483fd74017fb
 SHA512:
-  metadata.gz: bd0aed05c4abd6a476a5126e6bb4f88b998ce070a7f29cf7c2a1b6ec5778f43d8458d3a7baa1f610b8967ca257868117dcb2c1351b079ca863066959ba062702
-  data.tar.gz: 16602e933fd8b9312a797c8d40472d1e7cc3bc14eafd0b0d24362e1b2e3beb9d75740d0c1154c009e2957dc7fac5c9717d012cba0da686fafe1215ff1dfc262b
+  metadata.gz: e49eed7c0c95db152de38fa17312bd0bd544ee4f68d522811e35e1391c9615d4eec95009b73ace3e1a267302000113f27ead5362b60f081a3b44ac22435e6120
+  data.tar.gz: aaf78332d70b1ad1768bce2575f6c68a7112b839e11d7eab0dca44ee87a5cf624c7466bcacfed88a1c8e76214b6852e47227c9c2b91c2a2ab80818fd4828cc80

data/.rubocop.yml

@@ -1,7 +1,8 @@
 AllCops:
+  NewCops: enable
+  SuggestExtensions: false
   Exclude:
     - bin/*
-    - spec/**/*
 
 Metrics/AbcSize:
   Max: 45
@@ -24,47 +25,11 @@ Metrics/PerceivedComplexity:
 Layout/LineLength:
   Max: 200
 
-Layout/EmptyLinesAroundAttributeAccessor:
-  Enabled: true
-
-Layout/SpaceAroundMethodCallOperator:
-  Enabled: true
-
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-Lint/DeprecatedOpenSSLConstant:
-  Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
-  Enabled: true
+Lint/MissingSuper:
+  Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-Style/ExponentialNotation:
-  Enabled: true
-
-Style/SlicingWithRange:
-  Enabled: true
-
 Style/SymbolArray:
   Enabled: false
-
-Style/RedundantRegexpCharacterClass:
-  Enabled: true
-
-Style/RedundantRegexpEscape:
-  Enabled: true

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shortlook (0.1.3)
-      lhc (>= 10.3, < 12.0)
+    shortlook (0.1.5)
+      lhc (>= 13.0)
       pastel (~> 0.7.2)
-      thor (>= 0.20, < 1.1)
+      thor (>= 0.20, < 1.2)
       tty-command (>= 0.8, < 0.10)
       tty-config (>= 0.3, < 0.5)
       tty-prompt (>= 0.18, < 0.22)
@@ -13,68 +13,53 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
     equatable (0.6.1)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
-    i18n (1.8.2)
+    ffi (1.14.2)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    lhc (11.1.1)
-      activesupport (>= 4.2)
+    lhc (13.1.0)
+      activesupport (>= 5.2)
       addressable
       typhoeus (>= 0.11)
-    minitest (5.14.1)
+    minitest (5.14.3)
     necromancer (0.5.1)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    public_suffix (4.0.4)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.0)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.85.0)
+    rubocop (1.9.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tty-color (0.5.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    thor (1.1.0)
+    tty-color (0.6.0)
     tty-command (0.9.0)
       pastel (~> 0.7.0)
     tty-config (0.4.0)
@@ -87,16 +72,16 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.1)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
     wisper (2.0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -104,8 +89,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.85.0)
+  rubocop (~> 1.9.1)
   shortlook!
 
 BUNDLED WITH

data/README.md

@@ -73,7 +73,7 @@ create  ShortLook-WhatsAppMessenger/control
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,8 +1,3 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/lib/shortlook/cli.rb

@@ -1,20 +1,12 @@
 # frozen_string_literal: true
 
 require 'thor'
+require_relative 'provider_helpers'
 
 module Shortlook
   class CLI < Thor
     include Thor::Actions
 
-    Error = Class.new(StandardError)
-
-    desc 'version', 'shortlook version'
-    def version
-      require_relative 'version'
-      puts "v#{Shortlook::VERSION}"
-    end
-    map %w[--version -v] => :version
-
     def self.source_root
       File.dirname(__FILE__)
     end
@@ -24,34 +16,15 @@ module Shortlook
     end
 
     no_commands do
-      def class_name
-        @config[:class_name]
-      end
-
-      def bundle_id
-        @config[:bundle_id]
-      end
-
-      def provider_bundle_id
-        @config[:provider_bundle_id]
-      end
-
-      def name
-        @config[:name]
-      end
-
-      def type
-        @config[:type]
-      end
-
-      def author
-        @config[:author]
-      end
+      include ProviderHelpers
+    end
 
-      def provider_name
-        @config[:provider_name]
-      end
+    desc 'version', 'shortlook version'
+    def version
+      require_relative 'version'
+      puts "v#{Shortlook::VERSION}"
     end
+    map %w[--version -v] => :version
 
     desc 'provider NAME', 'Generate a scaffold ShortLook Provider'
     def provider(name)

data/lib/shortlook/command.rb

@@ -5,24 +5,12 @@ require 'forwardable'
 module Shortlook
   class Command
     extend Forwardable
-
     def_delegators :command, :run
 
-    # Execute this command
-    #
-    # @api public
     def execute(*)
-      raise(
-        NotImplementedError,
-        "#{self.class}##{__method__} must be implemented"
-      )
+      raise(NotImplementedError, "#{self.class}##{__method__} must be implemented")
     end
 
-    # The interactive prompt
-    #
-    # @see http://www.rubydoc.info/gems/tty-prompt
-    #
-    # @api public
     def prompt(**options)
       require 'tty-prompt'
       TTY::Prompt.new(options)

data/lib/shortlook/commands/provider.rb

@@ -1,84 +1,55 @@
 # frozen_string_literal: true
 
-require 'lhc'
-require 'json'
 require 'thor'
-
 require 'tty-spinner'
-require 'tty-config'
 
 require_relative '../command'
+require_relative '../types'
+require_relative '../config'
+require_relative '../services/app_store'
 
 module Shortlook
   module Commands
     class Provider < Shortlook::Command
       include Thor::Actions
 
-      TYPES = [
-        { name: 'Contact Photo', value: { name: 'ContactPhoto', display: 'Contact Photos', key: 'contact-photo' } },
-        { name: 'Profile Picture', value: { name: 'ProfilePicture', display: 'Profile Pictures', key: 'profile-picture' } },
-        { name: 'Photo', value: { name: 'Photo', display: 'Photos', key: 'photos' } },
-        { name: 'Cover', value: { name: 'Cover', display: 'Covers', key: 'covers' } }
-      ].freeze
+      def config
+        @config ||= Config.new
+      end
 
       def initialize(name)
-        @name = name
-        @config = TTY::Config.new
-        @config.append_path(Dir.home)
-
-        begin
-          @config.read("#{Dir.home}/.shortlook.yml")
-          @author = @config.fetch(:author)
-          @bundle_prefix = @config.fetch(:bundle_prefix)
-        rescue TTY::Config::ReadError
-          @config.filename = '.shortlook'
-          @author = ENV['USER']
-          @bundle_prefix = 'ch.marcoroth'
-        end
-
-        spinner = TTY::Spinner.new(":spinner Fetching Apps for '#{@name}'", format: :bouncing_ball)
+        spinner = TTY::Spinner.new(":spinner Fetching Apps for '#{name}'", format: :bouncing_ball)
         spinner.auto_spin
-
-        url = "https://itunes.apple.com/search?limit=10&media=software&term=#{@name}"
-        results = JSON.parse(LHC.get(url).body)['results']
-        @choices = results.map { |r| { name: "#{r['trackName']} (#{r['bundleId']})", value: r } }
+        @choices = Services::AppStore.search(name)
         spinner.stop
       end
 
       def execute(*)
         selected = prompt.select('Select the App you want to create a Provider for:', @choices)
-        full_name = prompt.ask('What\'s the name of your provider:', default: selected['trackName'])
-        type = prompt.select('Select the type of the provider:', TYPES)
-        @author = prompt.ask('What\'s your name?', default: @author)
-        @bundle_prefix = prompt.ask('What\'s your bundle identifier prefix:', default: @bundle_prefix)
+        full_name = prompt.ask("What's the name of your provider:", default: selected['trackName'])
+        type = prompt.select('Select the type of the provider:', Types.all)
+        author = prompt.ask("What's your name?", default: config.fetch(:author))
+        bundle_prefix = prompt.ask("What's your bundle identifier prefix:", default: config.fetch(:bundle_prefix))
 
-        name = full_name.gsub(/\W/, '')
-        bundle_id = selected['bundleId']
-        provider_name = "ShortLook-#{name}"
-        class_name = "#{name}#{type[:name]}Provider"
-        provider_bundle_id = "#{@bundle_prefix}.shortlook.plugin.#{type[:key]}.#{name.downcase}"
+        config.set(:author, value: author)
+        config.set(:bundle_prefix, value: bundle_prefix)
+        config.save!
 
-        save_config
+        name = full_name.gsub(' ', '')
 
         {
           name: full_name,
-          provider_name: provider_name,
-          class_name: class_name,
-          author: @author,
+          provider_name: "ShortLook-#{name}",
+          class_name: "#{name}#{type[:name]}Provider",
+          author: author,
           type: type,
-          bundle_id: bundle_id,
-          provider_bundle_id: provider_bundle_id
+          bundle_id: selected['bundleId'],
+          provider_bundle_id: "#{bundle_prefix}.shortlook.plugin.#{type[:key]}.#{name.downcase}"
         }
       rescue TTY::Reader::InputInterrupt
         puts "\nAborting..."
         exit(0)
       end
-
-      def save_config
-        @config.set(:author, value: @author)
-        @config.set(:bundle_prefix, value: @bundle_prefix)
-        @config.write(force: true)
-      end
     end
   end
 end

data/lib/shortlook/config.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+CONFIG_PATH = "#{Dir.home}/.shortlook.yml"
+
+require 'forwardable'
+require 'tty-config'
+
+module Shortlook
+  class Config
+    extend Forwardable
+
+    def_delegators :@config, :fetch, :set
+
+    def initialize
+      config.append_path(Dir.home)
+
+      begin
+        config.read("#{Dir.home}/.shortlook.yml")
+      rescue TTY::Config::ReadError
+        config.filename = '.shortlook'
+        config.set(:author, value: ENV['USER'])
+        config.set(:bundle_prefix, value: 'ch.marcoroth')
+      end
+    end
+
+    def config
+      @config ||= TTY::Config.new
+    end
+
+    def save!
+      config.write(force: true)
+    end
+  end
+end

data/lib/shortlook/provider_helpers.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Shortlook
+  module ProviderHelpers
+    def class_name
+      @config[:class_name]
+    end
+
+    def bundle_id
+      @config[:bundle_id]
+    end
+
+    def provider_bundle_id
+      @config[:provider_bundle_id]
+    end
+
+    def name
+      @config[:name]
+    end
+
+    def type
+      @config[:type]
+    end
+
+    def author
+      @config[:author]
+    end
+
+    def provider_name
+      @config[:provider_name]
+    end
+  end
+end

data/lib/shortlook/services/app_store.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'lhc'
+require 'json'
+
+module Shortlook
+  module Services
+    class AppStore
+      URL = 'https://itunes.apple.com/search'
+
+      def self.search(name)
+        params = { limit: 10, media: 'software', term: name }
+
+        LHC.get(URL, params: params).data.results.map do |r|
+          {
+            name: "#{r['trackName']} (#{r['bundleId']})",
+            value: r
+          }
+        end
+      end
+    end
+  end
+end

data/lib/shortlook/types.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Shortlook
+  class Types
+    def self.all
+      [
+        { name: 'Contact Photo', value: { name: 'ContactPhoto', display: 'Contact Photos', key: 'contact-photo' } },
+        { name: 'Profile Picture', value: { name: 'ProfilePicture', display: 'Profile Pictures', key: 'profile-picture' } },
+        { name: 'Photo', value: { name: 'Photo', display: 'Photos', key: 'photos' } },
+        { name: 'Cover', value: { name: 'Cover', display: 'Covers', key: 'covers' } }
+      ]
+    end
+  end
+end

data/lib/shortlook/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shortlook
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/shortlook.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'lhc', '>= 10.3', '< 12.0'
+  spec.add_dependency 'lhc', '>= 13.0'
   spec.add_dependency 'pastel', '~> 0.7.2'
-  spec.add_dependency 'thor', '>= 0.20', '< 1.1'
+  spec.add_dependency 'thor', '>= 0.20', '< 1.2'
   spec.add_dependency 'tty-command', '>= 0.8', '< 0.10'
   spec.add_dependency 'tty-config', '>= 0.3', '< 0.5'
   spec.add_dependency 'tty-prompt', '>= 0.18', '< 0.22'
@@ -33,6 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.85.0'
+  spec.add_development_dependency 'rubocop', '~> 1.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortlook
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Marco Roth
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +47,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +57,7 @@ dependencies:
         version: '0.20'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -166,34 +160,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 1.9.1
 description: ShortLook CLI for scaffoling a ShortLook Provider
 email:
 - marco.roth@intergga.ch
@@ -203,7 +183,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -217,6 +196,9 @@ files:
 - lib/shortlook/cli.rb
 - lib/shortlook/command.rb
 - lib/shortlook/commands/provider.rb
+- lib/shortlook/config.rb
+- lib/shortlook/provider_helpers.rb
+- lib/shortlook/services/app_store.rb
 - lib/shortlook/templates/provider/%class_name%.h.tt
 - lib/shortlook/templates/provider/%class_name%.m.tt
 - lib/shortlook/templates/provider/.gitignore
@@ -225,13 +207,14 @@ files:
 - lib/shortlook/templates/provider/README.md.tt
 - lib/shortlook/templates/provider/ShortLook-API.h
 - lib/shortlook/templates/provider/control.tt
+- lib/shortlook/types.rb
 - lib/shortlook/version.rb
 - shortlook.gemspec
 homepage: https://github.com/marcoroth/shortlook-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,15 +222,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: ShortLook CLI for scaffoling a ShortLook Provider
 test_files: []

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper