yap-shell 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7186e70881e605ba5563cd30e9674030c55f4332
-  data.tar.gz: abbfa86bde0fabf472adca6a87843588e8760671
+  metadata.gz: b745bf1643f4cc00a8863cd3bd0ea4a418f1404a
+  data.tar.gz: 0db3fb4d29ec34e83176c5acb7c39f27106ec027
 SHA512:
-  metadata.gz: 4498e667793d6009c6a988fd85b3977b7a01d79dee15565e71b9c6b10cc86a844263f9215205bf382e9ad152fde34589890d022a7bdb92d536204e3595df967f
-  data.tar.gz: fb6bff600285457f6aeea74c1fb5bf8d843dbba8b4a3b17c791b69ebd5dd93a5c1e2e0f7b7a660ed64afe468e49a3e2a73801a643d17fa811bfa6055ced9710f
+  metadata.gz: ac7bb1a89d06d54b01084d9ac30d4603e2d383f8f294b24470749aa9946cd8cb9bb0693a24ff05828ae14a1392266d782fa4a173ea09773ab36f3a1cfbfca754
+  data.tar.gz: 12347f2b492455fc8b9068c229cc8efae97bdac7bafaecc5faf343ab7d4cd02040a796c3d291c92879c86a7dfde549bbed0e3603720b01ca68e52dc1fef4d3ce

data/Gemfile.travis.lock

@@ -0,0 +1,104 @@
+GIT
+  remote: https://github.com/zdennis/rawline.git
+  revision: 242e1946383811297b6180f327233f6d2108ae15
+  specs:
+    yap-rawline (0.5.1)
+      highline (~> 1.7, >= 1.7.2)
+      term-ansicolor (~> 1.3.0)
+      terminal-layout (~> 0.4.0)
+      treefell (~> 0.2.3)
+
+GIT
+  remote: https://github.com/zdennis/terminal-layout.git
+  revision: 976050c3a56a2a073934d4cfec2d0aeed163e857
+  specs:
+    terminal-layout (0.4.0)
+      highline (~> 1.7, >= 1.7.8)
+      ruby-terminfo (~> 0.1.1)
+      ruby-termios (~> 0.9.6)
+      treefell (~> 0.2.3)
+
+GIT
+  remote: https://github.com/zdennis/treefell.git
+  revision: 09e527ba07b413947d93c52a13cd5dd470d7b1fc
+  specs:
+    treefell (0.2.3)
+      term-ansicolor (~> 1.3)
+
+GIT
+  remote: https://github.com/zdennis/yap-shell-parser.git
+  revision: 6b8390ecdd47b58f2550d4844e7a285cc1bbc4aa
+  specs:
+    yap-shell-parser (0.7.0)
+      term-ansicolor (~> 1.3.0)
+      treefell (~> 0.2.3)
+
+PATH
+  remote: .
+  specs:
+    yap-shell (0.6.0)
+      chronic (~> 0.10.2)
+      pry-byebug (~> 3.3)
+      ruby-terminfo (~> 0.1.1)
+      ruby-termios (~> 0.9.6)
+      term-ansicolor (~> 1.3)
+      treefell (~> 0.2.3)
+      yap-rawline (~> 0.5.1)
+      yap-shell-parser (~> 0.7.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (9.0.5)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    chronic (0.10.2)
+    coderay (1.1.1)
+    diff-lcs (1.2.5)
+    ffi (1.9.10)
+    highline (1.7.8)
+    method_source (0.8.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rake (11.2.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    ruby-terminfo (0.1.1)
+    ruby-termios (0.9.6)
+    slop (3.6.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    tins (1.10.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  childprocess (~> 0.5.9)
+  rake (~> 11)
+  rspec (~> 3.0)
+  terminal-layout!
+  treefell!
+  yap-rawline!
+  yap-shell!
+  yap-shell-parser!
+
+BUNDLED WITH
+   1.12.5

data/bin/yap

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 
+ENV['PWD'] = Dir.pwd
+
 # Start YAP with a pristine environment
 env2keep = {
   # DISPLAY needs to be inherited in order to launch GUI apps
   'DISPLAY' => ENV['DISPLAY'],
   'HOME' => ENV['HOME'],
   'PATH' => ENV['PATH'],
+  'PWD' => ENV['PWD'],
 
   # For Yap's sanity
   'RUBYOPT' => '-rubygems -EUTF-8',
@@ -13,6 +16,9 @@ env2keep = {
   # Inherit the user's preferred shell
   'SHELL' => ENV['SHELL'],
 
+  # Set the logged in user
+  'USER' => ENV['USER'],
+
   # Necessary for ssh-agent
   'SSH_AUTH_SOCK' => ENV['SSH_AUTH_SOCK'],
 

data/bin/yap-dev

@@ -4,5 +4,42 @@ require 'bundler'
 Bundler.setup
 require 'pry'
 
+module SilenceWarnings
+  # Runs a block of code without warnings.
+  def self.silence_warnings(&block)
+    warn_level = $VERBOSE
+    $VERBOSE = nil
+    result = block.call
+    $VERBOSE = warn_level
+    result
+  end
+end
+
+### START debundle.rb ###
+
+# MIT License
+# Copyright (c) Conrad Irwin <conrad.irwin@gmail.com>
+# Copyright (c) Jan Lelis <mail@janlelis.de>
+
+module Debundle
+  VERSION = '1.0.0'
+
+  def self.debundle!
+    if Gem.post_reset_hooks.reject!{ |hook| hook.source_location.first =~ %r{/bundler/} }
+      Gem.clear_paths
+      SilenceWarnings.silence_warnings do
+        load 'rubygems/core_ext/kernel_require.rb'
+        load 'rubygems/core_ext/kernel_gem.rb'
+      end
+    end
+  rescue => e
+    warn "DEBUNDLE.RB FAILED: #{e.class}\n#{e.message}"
+  end
+end
+
+Debundle.debundle!
+
+### END debundle.rb ###
+
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 load File.dirname(__FILE__) + '/yap'

data/lib/yap.rb

@@ -6,57 +6,47 @@ require "treefell"
 require 'optparse'
 
 module Yap
+  require 'yap/cli/options'
   require 'yap/configuration'
   require 'yap/shell'
   require 'yap/world'
 
-  def self.parse_cli_args_for_configuration(args, configuration)
-    OptionParser.new do |opts|
-      opts.on('-h', '--help', 'Prints this help') do
-        puts opts
-        exit
-      end
-
-      opts.on('--skip-first-time', 'Disables creating ~/.yap directory on shell startup') do
-        configuration.skip_first_time = true
-      end
-
-      opts.on('--no-addons', 'Disables auto-loading addons on shell startup') do
-        configuration.use_addons = false
-      end
-
-      opts.on('--no-history', 'Disables auto-loading or saving history') do
-        configuration.use_history = false
-      end
-
-      opts.on('--no-rcfiles', 'Disables auto-loading rcfiles on shell startup') do
-        configuration.use_rcfiles = false
-      end
-    end.parse!(args)
+  def self.root
+    Pathname.new File.join(File.dirname(__FILE__), '..')
   end
 
   def self.run_shell(argv)
     Treefell['shell'].puts "#{self}.#{__callee__} booting shell"
 
-    parse_cli_args_for_configuration(argv, configuration)
+    yap_options = Yap::Cli::Options.new
+    yap_options.parse(argv)
 
-    addons_loaded = []
-    if configuration.use_addons?
-      Treefell['shell'].puts "#{self}.#{__callee__} loading addons"
-      addons_loaded.concat \
-        World::Addons.load_directories(configuration.addon_paths)
-    else
-      Treefell['shell'].puts "#{self}.#{__callee__} skipping addons"
-    end
+    if configuration.run_shell?
+      configuration.yap_binpath = File.expand_path($0)
+
+      addons_loaded = []
+      if configuration.use_addons?
+        Treefell['shell'].puts "#{self}.#{__callee__} loading addons"
+        addons = Yap::Addon.load_for_configuration(configuration)
+        addons_loaded.concat addons
+      else
+        Treefell['shell'].puts "#{self}.#{__callee__} skipping addons"
+      end
+
+      if configuration.use_rcfiles?
+        Treefell['shell'].puts "#{self}.#{__callee__} loading rcfiles"
+        addons_loaded.concat \
+          Yap::Addon.load_rcfiles(configuration.rcfiles)
+      else
+        Treefell['shell'].puts "#{self}.#{__callee__} skipping rcfiles"
+      end
 
-    if configuration.use_rcfiles?
-      Treefell['shell'].puts "#{self}.#{__callee__} loading rcfiles"
-      addons_loaded.concat \
-        World::Addons.load_rcfiles(configuration.rcfiles)
+      Shell::Impl.new(addons: addons_loaded).repl
+    elsif yap_options.commands.any?
+      yap_options.commands.last.process
     else
-      Treefell['shell'].puts "#{self}.#{__callee__} skipping rcfiles"
+      STDERR.puts "Honestly, I don't know what you're tring to do."
+      exit 1
     end
-
-    Shell::Impl.new(addons: addons_loaded).repl
   end
 end

data/lib/yap/addon.rb

@@ -0,0 +1,24 @@
+require 'yap/addon/base'
+require 'yap/addon/export_as'
+require 'yap/addon/loader'
+require 'yap/addon/path'
+require 'yap/addon/rc_file'
+require 'yap/addon/reference'
+
+module Yap
+  module Addon
+    def self.load_rcfiles(files)
+      Yap::Addon::Loader.load_rcfiles(files)
+    end
+
+    def self.load_for_configuration(configuration)
+      addon_references = Yap::Addon::Path.find_for_configuration(configuration)
+      Yap::Addon::Loader.new(addon_references).load_all
+    end
+
+    def self.export_as_for_gemspec(gemspec)
+      addonrb_path = File.join('lib', gemspec.name + '.rb')
+      ExportAs.find_in_file(addonrb_path)
+    end
+  end
+end

data/lib/yap/addon/base.rb

@@ -0,0 +1,52 @@
+module Yap
+  module Addon
+    class Base
+      def self.load_addon
+        @instance ||= new
+      end
+
+      def self.addon_name
+        @addon_name ||= begin
+          addon_name = self.name.split(/::/)
+            .last.scan(/[A-Z][^A-Z]+/)
+            .map(&:downcase).reject{ |f| f == "addon" }
+            .join("_")
+            .to_sym
+          addon_name.length == 0 ? self.name : addon_name
+        end
+      end
+
+      def self.export_as(name=nil)
+        if name
+          @export_as = name.to_sym
+        end
+        @export_as
+      end
+
+      def self.logger
+        calling_method = caller[1][/`.*'/][1..-2]
+        Treefell["addon:#{export_as}"]["#{name}##{calling_method}"]
+      end
+
+      def addon_name
+        @addon_name ||= self.class.addon_name
+      end
+
+      def logger
+        self.class.logger
+      end
+
+      def export_as
+        self.class.export_as
+      end
+
+      def initialize(enabled: true)
+        @yap_enabled = enabled
+      end
+
+      def yap_enabled?
+        @yap_enabled
+      end
+    end
+  end
+end

data/lib/yap/addon/export_as.rb

@@ -0,0 +1,12 @@
+module Yap
+  module Addon
+    module ExportAs
+      def self.find_in_file(path)
+        export_as = File.read(path).
+          scan(/export_as\(?\s*:?(['"]?)(.*)\1/).
+          flatten.
+          last
+      end
+    end
+  end
+end

data/lib/yap/addon/loader.rb

@@ -0,0 +1,84 @@
+module Yap
+  module Addon
+    class Loader
+      def initialize(addon_references)
+        @addon_references = addon_references
+      end
+
+      def load_all
+        @addon_references.map do |reference|
+          load_reference(reference)
+        end.compact
+      end
+
+      private
+
+      def bring_addon_into_existence(reference)
+        require reference.require_as
+        classified_name = reference.require_as.split('-').map(&:capitalize).join
+        unless Object.const_defined?(classified_name)
+          fail LoadError, "Expected #{name}.rb to load #{classified_name}, but it didn't"
+        end
+
+        addon = Object.const_get(classified_name)
+        addon_class = if addon.is_a?(Addon)
+          addon
+        elsif addon.const_defined?(:Addon)
+          addon.const_get(:Addon)
+        else
+          fail LoadError, "Expected gem #{name} to define a constant, but nothing was found"
+        end
+        addon_class.new enabled: reference.enabled?
+      end
+
+      def load_reference(reference)
+        begin
+          if Gem.path.any? { |path| reference.path.include?(path) }
+            load_gem reference
+          else
+            load_non_gem reference
+          end
+        rescue Exception => ex
+          puts Term::ANSIColor.red("Rut roh! The #{reference.name} addon failed to load.")
+          puts
+          puts ex.message
+          puts
+          puts "To uninstall this addon:"
+          puts
+          puts "   gem uninstall #{reference.require_as}"
+          puts
+          puts "Note: this did not stop yap from loading, but functionality from the addon will be missing."
+        end
+      end
+
+      def load_gem(reference)
+        gem reference.require_as
+        bring_addon_into_existence reference
+      end
+
+      def load_non_gem(reference)
+        lib_path = File.expand_path File.join(reference.path, 'lib')
+        Treefell['addon'].puts "prepending addon path to $LOAD_PATH: #{lib_path}"
+        $LOAD_PATH.unshift lib_path
+
+        bring_addon_into_existence reference
+      ensure
+        Treefell['addon'].puts "Removing addon #{lib_path} path from $LOAD_PATH"
+        $LOAD_PATH.delete(lib_path)
+      end
+
+      def self.load_rcfiles(files)
+        Treefell['addon'].puts %|searching for rcfiles:\n  * #{files.join("\n  * ")}|
+        files.map do |file|
+          if File.exists?(file)
+            Treefell['addon'].puts "rcfile #{file} found, loading."
+            RcFile.new file
+          else
+            Treefell['addon'].puts "rcfile #{file} not found, skipping."
+          end
+        end.flatten.compact
+      end
+
+    end
+  end
+end