import_js 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b23358bb0d61ef8fac8b2e8789f2bfffa092fb9
-  data.tar.gz: 132643d9f5029de7cf5087d496fedb91e53d903b
+  metadata.gz: b70c1d5fa29773c4f00513bb4826ec35b4e5cbae
+  data.tar.gz: 235340096abac84c1e4b8d80cd15bb29522bb928
 SHA512:
-  metadata.gz: 51cd0b9b042fe549668137d6635a68589d031a72ab40fae39908604101fa632363b701546c194d87b0a3140714c10234434127fe4bd679f40c8d8d56855a26df
-  data.tar.gz: b7ccd7a213c9dbd9cd80db90b70421dd16e1b4a9d88a79b67b63ea210611ea72f66c805d07c698baf4dae78dd854292012e56b89e07db04f21e9aed627813cfc
+  metadata.gz: 029f4a067d7e9e924842aa047f4308113ee8309a01871ad797585da2dd658f3a9b4093fbc3a82df3ab64e96a2746945ed3ac968f9149c0e8e1e20a20864d51ac
+  data.tar.gz: 58f4f6b597977e7712a2755f5b7753144727228ddae6b92e01ade3380aa9887df2f688aed993fab7b77d11892deca84816e0f13cec03b4b3a8656f0e1e29dc83

data/bin/import-js

@@ -1,18 +1,47 @@
 #!/usr/bin/env ruby
 
 require 'import_js'
+require 'slop'
+require 'json'
+
+opts = Slop.parse do |o|
+  o.string '-w', '--word', 'a word/variable to import'
+  o.array '--selections', 'a list of resolved selections, e.g. Foo:0,Bar:1'
+  o.on '-v', '--version', 'print the current version' do
+    puts ImportJS::VERSION
+    exit
+  end
+  o.on '-h', '--help', 'prints help' do
+    puts o
+    exit
+  end
+end
 
-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')
+if opts[:selections]
+  # Convert array of string tuples to hash, `word` => `selectedIndex`
+  opts[:selections] = Hash[opts[:selections].map do |str|
+    tuple = str.split(':')
+    [tuple.first, tuple[1].to_i]
+  end]
+end
 
-editor = ImportJS::CommandLineEditor.new(word, file_contents)
+editor = ImportJS::CommandLineEditor.new(file_contents, opts)
 importer = ImportJS::Importer.new(editor)
-if word
+if opts[:word]
   importer.import
 else
   importer.import_all
 end
+
+# Print resulting file to stdout
 puts editor.current_file_content
+
+# Print messages to stderr
+meta = {
+  messages: editor.messages
+}
+ask = editor.ask_for_selections
+meta[:ask_for_selections] = ask unless ask.empty?
+STDERR.puts meta.to_json

data/lib/import_js.rb

@@ -8,10 +8,11 @@ module ImportJS
   end
 end
 
-require_relative 'import_js/js_module'
+require_relative 'import_js/command_line_editor'
+require_relative 'import_js/configuration'
+require_relative 'import_js/emacs_editor'
 require_relative 'import_js/import_statement'
 require_relative 'import_js/importer'
+require_relative 'import_js/js_module'
+require_relative 'import_js/version'
 require_relative 'import_js/vim_editor'
-require_relative 'import_js/emacs_editor'
-require_relative 'import_js/command_line_editor'
-require_relative 'import_js/configuration'

data/lib/import_js/command_line_editor.rb

@@ -1,8 +1,11 @@
 module ImportJS
   class CommandLineEditor
-    def initialize(word, lines)
-      @word = word
+    def initialize(lines, opts)
       @lines = lines
+      @messages = []
+      @ask_for_selections = []
+      @selections = opts[:selections] unless opts[:selections].empty?
+      @word = opts[:word]
     end
 
     # @return [String]
@@ -10,6 +13,12 @@ module ImportJS
       @word
     end
 
+    # @return [String?]
+    def path_to_current_file
+      # Not yet implemented.
+      nil
+    end
+
     # @param file_path [String]
     def open_file(_file_path)
       fail 'not supported'
@@ -17,7 +26,12 @@ module ImportJS
 
     # @param str [String]
     def message(str)
-      puts str
+      @messages << str
+    end
+
+    # @return [Array]
+    def ask_for_selections
+      @ask_for_selections
     end
 
     # @return [String]
@@ -25,6 +39,11 @@ module ImportJS
       @lines.join("\n")
     end
 
+    # @return [String]
+    def messages
+      @messages.join("\n")
+    end
+
     # Reads a line from the file.
     #
     # Lines are one-indexed, so 1 means the first line in the file.
@@ -75,31 +94,31 @@ module ImportJS
 
     # Ask the user to select something from a list of alternatives.
     #
-    # @param heading [String] A heading text
+    # @param word [String] The word/variable to import
     # @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}"
+    def ask_for_selection(word, alternatives)
+      if @selections
+        # this is a re-run, where selections have already been made
+        @selections[word]
+      else
+        @ask_for_selections << {
+          word: word,
+          alternatives: alternatives
+        }
+        nil
       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
+    # 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`
+    #   otherwise `\t`.
     def tab
       '  '
     end

data/lib/import_js/emacs_editor.rb

@@ -113,13 +113,13 @@ class ImportJS::EmacsEditor
 
   # Ask the user to select something from a list of alternatives.
   #
-  # @param heading [String] A heading text
+  # @param word [String] The word/variable to import
   # @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)
+  def ask_for_selection(word, alternatives)
     puts "asking for selection"
-    puts heading
+    puts "ImportJS: Pick JS module to import for '#{word}':"
     puts JSON.pretty_generate(alternatives)
     return
 

data/lib/import_js/importer.rb

@@ -288,7 +288,7 @@ module ImportJS
       end
 
       selected_index = @editor.ask_for_selection(
-        "\"ImportJS: Pick JS module to import for '#{variable_name}': #{timing}\"",
+        variable_name,
         js_modules.map(&:display_name)
       )
       return unless selected_index

data/lib/import_js/version.rb

@@ -0,0 +1,4 @@
+# Defines the gem version.
+module ImportJS
+  VERSION = '0.1.0'
+end

data/lib/import_js/vim_editor.rb

@@ -93,12 +93,13 @@ module ImportJS
 
     # Ask the user to select something from a list of alternatives.
     #
-    # @param heading [String] A heading text
+    # @param word [String] The word/variable to import
     # @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)
-      escaped_list = [heading]
+    def ask_for_selection(word, alternatives)
+      escaped_list =
+        ["\"ImportJS: Pick JS module to import for '#{word}':\""]
       escaped_list << alternatives.each_with_index.map do |alternative, i|
         "\"#{i + 1}: #{alternative}\""
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: import_js
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Henric Trotzig
@@ -9,7 +9,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-11-15 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.1
 description: A tool to simplify importing javascript modules
 email: henric.trotzig@gmail.com
 executables:
@@ -25,6 +45,7 @@ files:
 - lib/import_js/import_statement.rb
 - lib/import_js/importer.rb
 - lib/import_js/js_module.rb
+- lib/import_js/version.rb
 - lib/import_js/vim_editor.rb
 homepage: http://rubygems.org/gems/import_js
 licenses: