arli 0.7.0 → 0.8.3

data/lib/arli/lock/formats/text.rb

@@ -0,0 +1,13 @@
+require_relative 'base'
+
+module Arli
+  module Lock
+    module Formats
+      class Text < Base
+        def format(library)
+          "#{library.canonical_dir},#{library.version},#{library.path}"
+        end
+      end
+    end
+  end
+end

data/lib/arli/lock/formats/yaml.rb

@@ -0,0 +1,14 @@
+require_relative 'json'
+require 'yaml'
+module Arli
+  module Lock
+    module Formats
+      class Yaml < Json
+        def footer
+          "# vi:syntax=yaml\n" +
+          YAML.dump(hash)
+        end
+      end
+    end
+  end
+end

data/lib/arli/output.rb

@@ -3,15 +3,20 @@ require 'tty-cursor'
 
 module Arli
   module Output
+    CHAR_FAILURE = '✖'.red
+    CHAR_SUCCESS = '✔'.green
 
     class << self
       attr_accessor :enabled, :cursor
+
       def enable!
         self.enabled = true
       end
+
       def enabled?
         self.enabled
       end
+
       def disable!
         self.enabled = false
       end
@@ -40,13 +45,19 @@ module Arli
     end
 
     def report_exception(e, header = nil)
-      __pf header.bold.yellow + ': ' if header
+      if header
+        __pf header.bold.yellow + ': '
+      else
+        __pf 'Error: '.bold.red
+      end
       error e.message if (e && e.respond_to?(:message))
       if e && Arli.config.trace
-        __pf e.backtrace.reverse.join("\n")
+        __pf "\n"
+        __pf 'Top 10 stack trace'.bold.yellow + "\n"
+        __pf e.backtrace.reverse[-10..-1].join("\n").red + "\n"
       elsif e
         __pf "\nUse -t (--trace) for detailed exception\n" +
-             "or -D (--debug) to print Arli config\n"
+                 "or -D (--debug) to print Arli config\n"
       end
     end
 
@@ -73,24 +84,67 @@ module Arli
       printf(*args) if Arli::Output.enabled?
     end
 
-    def ok
-      ___ '.'.green
+
+    def print_target_dir(d, verb = 'installed')
+      print_action_success(d.green, "#{verb} #{d.green} ")
+    end
+
+    def print_action_starting(action_name)
+      if verbose?
+        indent_cursor
+        ___ "⇨  #{action_name.yellow} ... "
+      end
+      if block_given?
+        yield
+        ok if verbose?
+      end
+    end
+
+    def print_action_success(short, verbose = nil)
+      if verbose? && !quiet?
+        indent_cursor
+        ___ "⇨  #{verbose || short} #{CHAR_SUCCESS}"
+      elsif !quiet?
+        ___ "#{short} #{CHAR_SUCCESS} "
+      end
+    end
+
+    def print_action_failure(short, verbose = nil)
+      if verbose? && !quiet?
+        indent_cursor
+        ___ "⇨  #{verbose || short} #{CHAR_FAILURE}\n"
+      elsif !quiet?
+        ___ "#{short} #{CHAR_FAILURE} "
+      end
+    end
+
+    def action_fail(action, exception)
+      print_action_failure(action.class.action_name,
+                           "#{action.class.action_name} failed with #{exception.message.red}\n" +
+                               "Action Description: #{action.class.description}")
+      raise(exception)
     end
 
-    def check
-      ___ '✔'.green
+    def action_ok(action)
+      print_action_success(action.action_name)
+    end
+
+    def ok
+      ___ " #{CHAR_SUCCESS} "
     end
 
     def fuck
-      ___ '✖'.red
+      ___ " #{CHAR_FAILURE} "
     end
 
     def header(command: nil)
       out = "\n#{hr}\n"
       out << "Arli (#{::Arli::VERSION.yellow})"
-      out << " running command #{command.name.to_s.magenta.bold}" if command
-      out << " for #{command.params.to_s.blue}\n" if command
-      out << "Library Path: #{Arli.default_library_path.green}\n"
+      out << ", Command: #{command.name.to_s.magenta.bold}" if command
+      if command && command.params && Arli.config.verbose
+        out << "\n#{command.params.to_s.blue}\n"
+      end
+      out << "\nLibrary Path: #{Arli.default_library_path.green}\n"
       out << "#{hr}\n"
       info out
     end
@@ -99,5 +153,34 @@ module Arli
       ('-' * (ENV['COLUMNS'] || 80)).red.dark
     end
 
+    # Some shortcuts
+    def verbose?
+      config.verbose && !quiet?
+    end
+
+    def quiet?
+      config.quiet
+    end
+
+    def overwrite?
+      config.if_exists.overwrite
+    end
+
+    def backup?
+      config.if_exists.backup
+    end
+
+    def abort?
+      config.if_exists.abort
+    end
+
+    def debug?
+      config.debug
+    end
+
+    private
+    def indent_cursor
+      ___ cursor.column(40)
+    end
   end
 end

data/lib/arli/version.rb

@@ -1,3 +1,3 @@
 module Arli
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.3
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arduino-library
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: colored2
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: archive-zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-cursor
   requirement: !ruby/object:Gem::Requirement
@@ -255,15 +227,16 @@ files:
 - arli.gemspec
 - bin/console
 - bin/setup
-- docs/arli-full.png
 - docs/arli-in-action.png
+- docs/arlifile.png
 - exe/arli
 - lib/arli.rb
 - lib/arli/actions.rb
 - lib/arli/actions/action.rb
 - lib/arli/actions/dir_name.rb
 - lib/arli/actions/git_repo.rb
-- lib/arli/actions/zip_file.rb
+- lib/arli/actions/move_to_library_path.rb
+- lib/arli/actions/unzip_file.rb
 - lib/arli/arli_file.rb
 - lib/arli/cli.rb
 - lib/arli/cli/app.rb
@@ -273,13 +246,22 @@ files:
 - lib/arli/cli/runner.rb
 - lib/arli/commands.rb
 - lib/arli/commands/base.rb
+- lib/arli/commands/bundle.rb
 - lib/arli/commands/install.rb
 - lib/arli/commands/search.rb
 - lib/arli/configuration.rb
 - lib/arli/errors.rb
 - lib/arli/extensions.rb
-- lib/arli/installer.rb
 - lib/arli/library.rb
+- lib/arli/library/installer.rb
+- lib/arli/library/proxy.rb
+- lib/arli/lock/file.rb
+- lib/arli/lock/formats.rb
+- lib/arli/lock/formats/base.rb
+- lib/arli/lock/formats/cmake.rb
+- lib/arli/lock/formats/json.rb
+- lib/arli/lock/formats/text.rb
+- lib/arli/lock/formats/yaml.rb
 - lib/arli/output.rb
 - lib/arli/version.rb
 homepage: https://github.com/kigster/arli

data/lib/arli/installer.rb

@@ -1,52 +0,0 @@
-require 'forwardable'
-require 'arli'
-require_relative 'actions'
-
-module Arli
-  class Installer
-    include ::Arli::Output
-
-    extend Forwardable
-    def_delegators :@library, :exists?
-
-    attr_accessor :library, :config
-
-    def initialize(library, config: Arli.config)
-      self.config  = config
-      self.library = library
-    end
-
-    def install
-      ___ "#{library.name.blue} "
-
-      if library.nil? && library.library.nil?
-        ___ ' (no library) '
-        fuck
-      elsif library.url.nil?
-        ___ ' (no url) '
-        fuck
-      else
-        ___ "(#{library.version.green}) " if library.version
-        ___ cursor.column(45) unless config.quiet
-        actions(library).each do |action|
-          run_action(action)
-        end
-      end
-      ___ "\n"
-    end
-
-    def run_action(action)
-      klass = Arli::Actions.action(action)
-      klass.new(library, config: config).act if klass
-    end
-
-    def actions(library)
-      actions = []
-      # First, how do we get the library?
-      actions << ((library.url =~ /\.zip$/i) ? :zip_file : :git_repo)
-      actions << :dir_name
-      actions
-    end
-  end
-end
-