import_js 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330ead6ec7804b53e85225024d9d66d001c29719
-  data.tar.gz: d959cff0e6e106e9035276a1ad69ecb740abbe74
+  metadata.gz: 80847dd047d3098f2375708a53acbe8fe3b788d3
+  data.tar.gz: 63db9742a0a4bdb87b019020cf1f20a2fb8f82dd
 SHA512:
-  metadata.gz: c6c7c887852626478ab3a3496082ec2733e03570fe46fb3aef9a113a7d490645d9c3485913c611c424e3b51cc33831c148598668b912cc51d78aa6a76579a70c
-  data.tar.gz: eee49961904abde1dbc4135263ed7c637ae8920a76060137c9ed1f679d393f33c4f620c8d6605ed297e16208d42cf2347c927a0c68e69f27f878490b28cec058
+  metadata.gz: 1c6631a83e5bc9498db3d1c39a41c5f56df7e2a032b1624a7aa4b3d64b6215cb9990369bec4bbabe4406001245ab921228b1298cc75c5935383694316a3a8469
+  data.tar.gz: dcaf4142fb7e906c8cdb466c14a421bc8cd570c38bf240b7b93591dfc554deb025d135dedd45726252fa630133101c39da176987efdd9b09e8dd5d613094ecf7

data/bin/import-js

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'import_js'
+
+word = ARGV.delete_at(0)
+file_contents = STDIN.read.split("\n")
+
+# Reset stdin so that we can use it to ask users to resolve imports
+STDIN.reopen('/dev/tty')
+
+editor = ImportJS::CommandLineEditor.new(word, file_contents)
+importer = ImportJS::Importer.new(editor)
+if word
+  importer.import
+else
+  importer.import_all
+end
+puts editor.current_file_content

data/lib/import_js/command_line_editor.rb

@@ -0,0 +1,107 @@
+module ImportJS
+  class CommandLineEditor
+    def initialize(word, lines)
+      @word = word
+      @lines = lines
+    end
+
+    # @return [String]
+    def current_word
+      @word
+    end
+
+    # @param file_path [String]
+    def open_file(_file_path)
+      fail 'not supported'
+    end
+
+    # @param str [String]
+    def message(str)
+      puts str
+    end
+
+    # @return [String]
+    def current_file_content
+      @lines.join("\n")
+    end
+
+    # Reads a line from the file.
+    #
+    # Lines are one-indexed, so 1 means the first line in the file.
+    # @return [String]
+    def read_line(line_number)
+      @lines[line_number - 1]
+    end
+
+    # Get the cursor position.
+    #
+    # @return [Array(Number, Number)]
+    def cursor
+      # not relevant for this editor
+      [0, 0]
+    end
+
+    # Place the cursor at a specified position.
+    #
+    # @param _position_tuple [Array(Number, Number)] the row and column to place
+    #   the cursor at.
+    def cursor=(_position_tuple)
+      # no-op
+    end
+
+    # Delete a line.
+    #
+    # @param line_number [Number] One-indexed line number.
+    #   1 is the first line in the file.
+    def delete_line(line_number)
+      @lines.delete_at(line_number - 1)
+    end
+
+    # Append a line right after the specified line.
+    #
+    # Lines are one-indexed, but you need to support appending to line 0 (add
+    # content at top of file).
+    # @param line_number [Number]
+    def append_line(line_number, str)
+      @lines.insert(line_number, str)
+    end
+
+    # Count the number of lines in the file.
+    #
+    # @return [Number] the number of lines in the file
+    def count_lines
+      @lines.length
+    end
+
+    # Ask the user to select something from a list of alternatives.
+    #
+    # @param heading [String] A heading text
+    # @param alternatives [Array<String>] A list of alternatives
+    # @return [Number, nil] the index of the selected alternative, or nil if
+    #   nothing was selected.
+    def ask_for_selection(heading, alternatives)
+      puts heading
+      alternatives.each_with_index do |alt, i|
+        puts "#{i + 1}. #{alt}"
+      end
+      print 'Select number: '
+      selected = gets.strip
+      selected_index = selected.to_i - 1
+      return nil if selected_index < 0
+      return nil if selected_index >= alternatives.length
+      selected_index
+    end
+
+    # Get the preferred max length of a line
+    # @return [Number?]
+    def max_line_length
+      80
+    end
+
+    # @return [String] shiftwidth number of spaces if expandtab is not set,
+    #   otherwise `\t`
+    def tab
+      '  '
+    end
+  end
+end

data/lib/import_js/configuration.rb

@@ -48,23 +48,6 @@ module ImportJS
       nil
     end
 
-    # @return [Number?]
-    def columns
-      get_number('&columns')
-    end
-
-    # @return [Number?]
-    def text_width
-      get_number('&textwidth')
-    end
-
-    # @return [String] shiftwidth number of spaces if expandtab is not set,
-    #   otherwise `\t`
-    def tab
-      return "\t" unless expand_tab?
-      ' ' * (shift_width || 2)
-    end
-
     # @return [Array<String>]
     def package_dependencies
       return [] unless File.exist?('package.json')
@@ -90,39 +73,5 @@ module ImportJS
     def config_file_last_modified
       File.exist?(CONFIG_FILE) ? File.mtime(CONFIG_FILE) : nil
     end
-
-    # Check for the presence of a setting such as:
-    #
-    #   - g:CommandTSmartCase (plug-in setting)
-    #   - &wildignore         (Vim setting)
-    #   - +cursorcolumn       (Vim setting, that works)
-    #
-    # @param str [String]
-    # @return [Boolean]
-    def exists?(str)
-      VIM.evaluate(%{exists("#{str}")}).to_i != 0
-    end
-
-    # @param name [String]
-    # @return [Number?]
-    def get_number(name)
-      exists?(name) ? VIM.evaluate("#{name}").to_i : nil
-    end
-
-    # @param name [String]
-    # @return [Boolean?]
-    def get_bool(name)
-      exists?(name) ? VIM.evaluate("#{name}").to_i != 0 : nil
-    end
-
-    # @return [Boolean?]
-    def expand_tab?
-      get_bool('&expandtab')
-    end
-
-    # @return [Number?]
-    def shift_width
-      get_number('&shiftwidth')
-    end
   end
 end

data/lib/import_js/importer.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'json'
 require 'open3'
 
@@ -58,12 +57,7 @@ module ImportJS
     private
 
     def message(str)
-      str = "[import-js] #{str}"
-      if str.length > @config.columns - 1
-        str = str[0...(@config.columns - 2)] + '…'
-      end
-
-      @editor.message(str)
+      @editor.message("[import-js] #{str}")
     end
 
     # @return [Array]
@@ -112,7 +106,7 @@ module ImportJS
 
       modified_imports = old_imports[:imports] # Array
 
-      # Add new import to the block of imports, wrapping at text_width
+      # Add new import to the block of imports, wrapping at the max line length
       unless js_module.is_destructured && inject_destructured_variable(
         variable_name, js_module, modified_imports)
         modified_imports << generate_import(variable_name, js_module)
@@ -191,8 +185,8 @@ module ImportJS
       end
       value = "require('#{js_module.import_path}');"
 
-      if @config.text_width && "#{declaration} #{value}".length > @config.text_width
-        "#{declaration}\n#{@config.tab}#{value}"
+      if @editor.max_line_length && "#{declaration} #{value}".length > @editor.max_line_length
+        "#{declaration}\n#{@editor.tab}#{value}"
       else
         "#{declaration} #{value}"
       end

data/lib/import_js/vim_editor.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module ImportJS
   # This is the implementation of the VIM integration in Import-JS. It can be
   # used as a template for other editor integrations.
@@ -20,6 +21,11 @@ module ImportJS
     #
     # @param str [String]
     def message(str)
+      # To prevent having to press enter to dismiss, we ellipsize the message
+      if str.length > available_columns - 1
+        str = str[0...(available_columns - 2)] + '…'
+      end
+
       VIM.command(":call importjs#WideMsg('#{str}')")
     end
 
@@ -94,5 +100,59 @@ module ImportJS
       return if selected_index < 1
       selected_index - 1
     end
+
+    # Get the preferred max length of a line
+    # @return [Number?]
+    def max_line_length
+      get_number('&textwidth')
+    end
+
+    # @return [String] shiftwidth number of spaces if expandtab is not set,
+    #   otherwise `\t`
+    def tab
+      return "\t" unless expand_tab?
+      ' ' * (shift_width || 2)
+    end
+
+    private
+
+    # Check for the presence of a setting such as:
+    #
+    #   - g:CommandTSmartCase (plug-in setting)
+    #   - &wildignore         (Vim setting)
+    #   - +cursorcolumn       (Vim setting, that works)
+    #
+    # @param str [String]
+    # @return [Boolean]
+    def exists?(str)
+      VIM.evaluate(%{exists("#{str}")}).to_i != 0
+    end
+
+    # @return [Number?]
+    def available_columns
+      get_number('&columns')
+    end
+
+    # @param name [String]
+    # @return [Number?]
+    def get_number(name)
+      exists?(name) ? VIM.evaluate("#{name}").to_i : nil
+    end
+
+    # @param name [String]
+    # @return [Boolean?]
+    def get_bool(name)
+      exists?(name) ? VIM.evaluate("#{name}").to_i != 0 : nil
+    end
+
+    # @return [Boolean?]
+    def expand_tab?
+      get_bool('&expandtab')
+    end
+
+    # @return [Number?]
+    def shift_width
+      get_number('&shiftwidth')
+    end
   end
 end

data/lib/import_js.rb

@@ -7,4 +7,5 @@ end
 require_relative 'import_js/js_module'
 require_relative 'import_js/importer'
 require_relative 'import_js/vim_editor'
+require_relative 'import_js/command_line_editor'
 require_relative 'import_js/configuration'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: import_js
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Henric Trotzig
@@ -12,11 +12,14 @@ date: 2015-11-15 00:00:00.000000000 Z
 dependencies: []
 description: A tool to simplify importing javascript modules
 email: henric.trotzig@gmail.com
-executables: []
+executables:
+- import-js
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/import-js
 - lib/import_js.rb
+- lib/import_js/command_line_editor.rb
 - lib/import_js/configuration.rb
 - lib/import_js/importer.rb
 - lib/import_js/js_module.rb