playwright-cli 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 368e6d76fcbddcc447c51c1aa01f2b026db700402fcc1bfa548a18968e1ffa35
-  data.tar.gz: 49222ff68b9e74a729f4e2992407b2c9eba996345b1e9649a064c4d456985c39
+  metadata.gz: bafee08c8b0e24f2b0882a4859f4914ce06c387b2571b32df27046102e9f1e67
+  data.tar.gz: 7eb962bd323173ebd00bc1fa40cbac7c5048efae7a8888155a6c0735e77583f8
 SHA512:
-  metadata.gz: dbb18e3e1632c70d251650d6c5c0c7f159b457948537824fef5af96908b0f64ab77056c361fb54408c81e98203db5bdda9aaa4c850b519b06849019d50b5e5cf
-  data.tar.gz: 4dfaa28467dfdd1f5e0a82ec6494c899e79ae22a50d58f33dcbb0e803aa67a1e1ff36694189c3e70ba3736295866f45abc3704372c15d0f2adc4abccaa25138e
+  metadata.gz: b4fc801b23ae330ae6c5d91770d19003c11fa59fec1bec20f6f32866874493dc840df87daebeedc1fd9f00d403447149ad02a9eeccd45de8a66dcffc8b005647
+  data.tar.gz: c023870ec50ea8a86a520f2ccf1fdfffbca1ff8c320e2d89b9e8b49045a6cbc2651f3a995c8e9765d5a3f965ce46ad205f7d2f228110bfd19ac5e9fb28d38a4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    playwright-cli (0.1.16)
+    playwright-cli (0.1.17)
       colorize (~> 0.1)
       git (~> 1.3)
       hanami-cli (~> 0.1)

data/lib/assets/templates/launch_script_template.erb

@@ -0,0 +1,28 @@
+function install_bundler {
+  echo "\033[0;32mYou don't have bundler???\nInstalling now...\033[0m" && gem install bundler
+}
+
+# Install bundler if they don't have it
+bundle -v &> /dev/null || install_bundler
+
+# Get ruby version
+PLAYWRIGHT_<%= val[:script_name].to_snake_case.upcase %>_RUBY_VERSION=$(ruby -ryaml -e " puts (YAML.load_file(\"#{ENV['HOME']}/.playwright/plays/<%= val[:script_name] %>/config.yml\")[:ruby_version] || '').gsub('.', '')")
+
+# command to run proper ruby version
+PLAYWRIGHT_RUBY_COMMAND="$HOME/.playwright/rubies/ruby$PLAYWRIGHT_<%= val[:script_name].to_snake_case.upcase %>_RUBY_VERSION"
+
+# Remember current gem env vars
+OLD_GEM_PATH=$GEM_PATH
+OLD_GEM_HOME=$GEM_HOME
+
+# Set gem home so that any new gems are installed to local folder
+GEM_HOME="$HOME/.playwright/plays/<%= val[:script_name] %>/gems"
+# Set gem path to use gems from local folder, as well as normal paths
+GEM_PATH="$GEM_HOME:$GEM_PATH"
+
+# Run play
+$PLAYWRIGHT_RUBY_COMMAND -W0 $HOME/.playwright/plays/<%= val[:script_name] %>/<%= val[:script_name] %> "$@"
+
+# Set gem env vars back to previous values
+GEM_HOME=$OLD_GEM_HOME
+GEM_PATH=$OLD_GEM_PATH

data/lib/ext/string.rb

@@ -0,0 +1,10 @@
+class String
+  # From ActiveSupport
+  def to_snake_case
+    gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+end

data/lib/playwright/cli/template.rb

@@ -3,8 +3,11 @@ require 'playwright/cli/utils/file_manager'
 module Playwright
   class CLI < Hanami::CLI
     class Template
+      include Utils::Display
 
-      attr_reader :script_name, :out_file, :type
+      InvalidTemplate = Class.new(StandardError)
+
+      attr_reader :script_name, :out_file, :type, :values
 
       SIMPLE_TYPE = :simple
       SIMPLE_TEMPLATE = 'simple_script_template.erb'
@@ -14,19 +17,27 @@ module Playwright
       SUBCOMMAND_TEMPLATE = 'version_subcommand_template.erb'
       README_TYPE = :readme
       README_TEMPLATE = 'script_readme_template.erb'
+      SHELL_SCRIPT_TYPE = :shell_script,
+      SHELL_SCRIPT_TEMPLATE = 'launch_script_template.erb'
 
       TEMPLATE_MAP = {
         SIMPLE_TYPE => SIMPLE_TEMPLATE,
         EXPANDED_TYPE => EXPANDED_TEMPLATE,
         SUBCOMMAND_TYPE => SUBCOMMAND_TEMPLATE,
-        README_TYPE => README_TEMPLATE
+        README_TYPE => README_TEMPLATE,
+        SHELL_SCRIPT_TYPE => SHELL_SCRIPT_TEMPLATE
       }
 
-      def initialize(name:, out_file:, type: SIMPLE_TYPE, klass_name: nil)
+      def render(*args)
+        new(*args).render
+      end
+
+      def initialize(name:, out_file:, type: SIMPLE_TYPE, klass_name: nil, values: {})
         @script_name = name
         @out_file = out_file
         @template_file = Playwright::CLI::TEMPLATES_PATH.join TEMPLATE_MAP[type]
         @klass_name = klass_name
+        @values = values
       end
 
       def klass_name
@@ -37,6 +48,11 @@ module Playwright
         contents = File.read(@template_file)
         text = ERB.new(contents).result(binding)
         File.write(out_file, text)
+        display.print "Rendered File Contents: #{out_file}"
+      end
+
+      def val
+        values
       end
 
     end

data/lib/playwright/cli/utils/ask.rb

@@ -19,8 +19,7 @@ module Playwright
 
           def boolean_question user_question
             response = question "#{user_question} [yn]"
-            sanitized_response = response.chomp.strip.downcase.to_sym if response && response.length > 0
-            boolean_response_map[response]
+            map_boolean_response response
           end
 
           def url_question user_question
@@ -39,8 +38,12 @@ module Playwright
 
           private
 
-          def boolean_response_map
-            { TRUE_RESPONSE => true, FALSE_RESPONSE => false }
+          def map_boolean_response value
+            { TRUE_RESPONSE => true, FALSE_RESPONSE => false }[sanitize_boolean_response value]
+          end
+
+          def sanitize_boolean_response value
+            value&.strip&.downcase&.to_sym
           end
 
         end

data/lib/playwright/cli/utils/display.rb

@@ -33,7 +33,7 @@ module Playwright
           def print msg, method: :puts, color: DEFAULT_COLOR, indent: false
             msg = stringify msg, indent: indent
             validate_print_method!(method)
-            msg = msg.send(color) if defined?(Colorize)
+            msg = msg.send(color) if defined?(Colorize) && msg
             send(method, msg)
           end
 
@@ -51,6 +51,8 @@ module Playwright
             when Array
               msg = msg.map { |ln| indentify(ln, count: indent) } if indent
               msg.join("\n")
+            else
+              msg.to_s
             end
           end
 

data/lib/playwright/cli/utils/file_manager.rb

@@ -21,6 +21,9 @@ module Playwright
           attr_reader :script_name, :type
 
           GITIGNORE = []
+          CONFIG_YML = {
+            ruby_version: RUBY_VERSION
+          }
 
           def initialize script_name: nil, type: nil
             @script_name = script_name
@@ -31,9 +34,11 @@ module Playwright
             @script_name = script_name
             @type = type
             create_script_files
+            symlink_ruby_version
             set_permissions
-            write_template
-            create_symlink
+            write_templates
+            create_symlinks
+            create_config_yml
             create_gitignore
             create_readme
             git_init
@@ -51,7 +56,11 @@ module Playwright
           end
 
           def script_name_rb
-            "#{script_name}.rb"
+            "#{script_name.to_snake_case}.rb"
+          end
+
+          def script_name_sh
+            "#{script_name}.sh"
           end
 
           def list_scripts
@@ -64,11 +73,11 @@ module Playwright
           private
 
           def self.playwright_parent_dir
-            Pathname.new(Playwright::CLI.configuration.home_dir)
+            Pathname.new Playwright::CLI.configuration.home_dir
           end
 
           def self.executable_path_dir
-            Pathname.new(Playwright::CLI.configuration.executable_path_dir)
+            Pathname.new Playwright::CLI.configuration.executable_path_dir
           end
 
           def self.dot_playwright_dir
@@ -79,17 +88,22 @@ module Playwright
             dot_playwright_dir.join 'plays'
           end
 
-          def self.config_file
+          def self.root_config_file
             dot_playwright_dir.join 'config.rb'
           end
 
+          def self.rubies_dir
+            dot_playwright_dir.join 'rubies'
+          end
+
           def self.create_file_structure
-            FileUtils.mkdir_p(plays_dir)
-            FileUtils.touch(config_file)
+            FileUtils.mkdir_p plays_dir
+            FileUtils.touch root_config_file
+            FileUtils.mkdir_p rubies_dir
           end
 
           def self.path
-            ENV['PATH'].split(':')
+            ENV['PATH'].split ':'
           end
 
           def self.all_commands_in_path
@@ -102,7 +116,7 @@ module Playwright
 # ==============================================================================
 
           def template
-            @template ||= Template.new(name: script_name_rb, out_file: executable_file, type: type)
+            @template ||= Template.new name: script_name, out_file: root_ruby_file, type: type
           end
 
 # ==============================================================================
@@ -113,16 +127,40 @@ module Playwright
             self.class.plays_dir.join script_name
           end
 
+          def bin_dir
+            root_dir.join 'bin'
+          end
+
+          def gems_dir
+            root_dir.join 'gems'
+          end
+
           def root_dir_exists?
             File.exists? root_dir
           end
 
-          def executable_file
+          def root_ruby_file
             root_dir.join script_name_rb
           end
 
-          def executable_file_exists?
-            File.exists? executable_file
+          def root_ruby_file_exists?
+            File.exists? root_ruby_file
+          end
+
+          def launch_script_file
+            bin_dir.join script_name_sh
+          end
+
+          def launch_script_file_exists?
+            File.exists? launch_script_file
+          end
+
+          def config_yml_file
+            root_dir.join 'config.yml'
+          end
+
+          def config_yml_file_exists?
+            File.exists? config_yml_file
           end
 
           def symlink_file
@@ -133,6 +171,22 @@ module Playwright
             File.symlink? symlink_file
           end
 
+          def local_symlink_file
+            root_dir.join script_name
+          end
+
+          def local_symlink_file_exists?
+            File.symlink? symlink_file
+          end
+
+          def ruby_version_symlink_file
+            self.class.rubies_dir.join "ruby#{ RUBY_VERSION.gsub '.', '' }"
+          end
+
+          def ruby_version_symlink_file_exists?
+            File.symlink? ruby_version_symlink_file
+          end
+
           def script_lib_dir
             root_dir.join 'lib'
           end
@@ -145,13 +199,31 @@ module Playwright
   # CREATE METHODS
   # ==============================================================================
 
+          def symlink_ruby_version
+            current_ruby = `which ruby`.chomp
+            FileUtils.symlink current_ruby, ruby_version_symlink_file unless ruby_version_symlink_file_exists?
+            display.print "New Symlink Created: #{ruby_version_symlink_file} from #{current_ruby}"
+          end
+
           def create_script_files
             validate_before_create_script_files!
             self.class.create_file_structure
+
             FileUtils.mkdir_p root_dir
             display.print "New Directory Created: #{root_dir}"
-            FileUtils.touch executable_file
-            display.print "New File Created: #{executable_file}"
+
+            FileUtils.mkdir_p gems_dir
+            display.print "New Directory Created: #{gems_dir}"
+
+            FileUtils.mkdir_p bin_dir
+            display.print "New Directory Created: #{bin_dir}"
+
+            FileUtils.touch root_ruby_file
+            display.print "New File Created: #{root_ruby_file}"
+
+            FileUtils.touch launch_script_file
+            display.print "New File Created: #{launch_script_file}"
+
             create_expanded_files if type == :expanded
           end
 
@@ -161,11 +233,13 @@ module Playwright
           end
 
           def set_permissions
-            FileUtils.chmod "u+x", executable_file
-            display.print "Executable Permissions Set: #{executable_file}"
+            FileUtils.chmod "u+x", root_ruby_file
+            display.print "Executable Permissions Set: #{root_ruby_file}"
+            FileUtils.chmod "u+x", launch_script_file
+            display.print "Executable Permissions Set: #{launch_script_file}"
           end
 
-          def write_template
+          def write_templates
             template.render
             if type == Template::EXPANDED_TYPE
               new_template = Template.new(
@@ -176,19 +250,31 @@ module Playwright
               )
               new_template.render
             end
+            launch_script_file_template = Template.new(
+              name: script_name_sh,
+              out_file: launch_script_file,
+              type: Template::SHELL_SCRIPT_TYPE,
+              values: {
+                script_name: script_name
+              }
+            )
+            launch_script_file_template.render
           end
 
-          def create_symlink
-            FileUtils.symlink(executable_file, symlink_file)
-            display.print "New Symlink Created: #{symlink_file} from #{executable_file}"
+          def create_symlinks
+            FileUtils.symlink launch_script_file, symlink_file
+            display.print "New Symlink Created: #{symlink_file} from #{launch_script_file}"
+
+            FileUtils.symlink root_ruby_file, local_symlink_file
+            display.print "New Symlink Created: #{local_symlink_file} from #{root_ruby_file}"
           end
 
           def validate_before_create_script_files!
-            if self.class.all_commands_in_path.include?(script_name)
+            if self.class.all_commands_in_path.include? script_name
               display.error "There is already a script in your $PATH with that name!"
-            elsif executable_file_exists?
+            elsif root_ruby_file_exists?
               if ask.boolean_question "This playwright script already exists! Overwrite it?"
-                delete_playwright_script
+                delete_script_files
               else
                 display.abort "Aborting Operation."
               end
@@ -198,7 +284,7 @@ module Playwright
           def git_init
             git = Git.init root_dir.to_s
             git.add all: true
-            git.commit('initial commit')
+            git.commit 'initial commit'
           end
 
           def create_gitignore
@@ -207,6 +293,12 @@ module Playwright
             end
           end
 
+          def create_config_yml
+            File.open config_yml_file, "w+" do |file|
+              file.write CONFIG_YML.to_yaml
+            end
+          end
+
           def create_readme
             FileUtils.touch root_dir.join("README.md")
             new_template = Template.new(
@@ -223,8 +315,8 @@ module Playwright
 
           def delete_script_files
             validate_before_delete_script_files!
-            FileUtils.rm_rf root_dir
-            FileUtils.rm symlink_file
+            FileUtils.rm_rf root_dir if Dir.exists? root_dir
+            FileUtils.rm symlink_file if File.symlink? symlink_file
             display.print "Playwright script '#{script_name}' destroyed!"
           end
 

data/lib/playwright/cli/version.rb

@@ -2,6 +2,6 @@ require 'hanami/cli'
 
 module Playwright
   class CLI < Hanami::CLI
-    VERSION = "0.1.16"
+    VERSION = "0.1.17"
   end
 end

data/lib/playwright/cli.rb

@@ -2,11 +2,14 @@ require 'hanami/cli'
 require 'colorize'
 require 'git'
 
-require 'fileutils'
 require 'erb'
+require 'fileutils'
 require 'os'
-require 'uri'
 require 'pathname'
+require 'uri'
+require 'yaml'
+
+require_relative '../ext/string'
 
 require_relative '../ext/hanami.rb'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playwright-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Mike Gregory
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,12 +170,14 @@ files:
 - bin/setup
 - exe/playwright
 - lib/assets/templates/expanded_script_template.erb
+- lib/assets/templates/launch_script_template.erb
 - lib/assets/templates/script_readme_template.erb
 - lib/assets/templates/simple_script_template.erb
 - lib/assets/templates/version_subcommand_template.erb
 - lib/ext/hanami.rb
 - lib/ext/hanami/option.rb
 - lib/ext/hanami/parser.rb
+- lib/ext/string.rb
 - lib/playwright/cli.rb
 - lib/playwright/cli/command.rb
 - lib/playwright/cli/commands.rb