arli 0.8.3 → 0.9.0

data/lib/arli/library.rb

@@ -1,8 +1,27 @@
+require_relative 'library/single_version'
+require_relative 'library/multi_version'
+require 'arduino/library/model'
+require 'arli/errors'
+
 module Arli
   module Library
+    def library_model(lib)
+      return lib if lib.is_a?(::Arduino::Library::Model)
+      ::Arduino::Library::Model.from(lib).tap do |model|
+        if model.nil?
+          lib_output = (lib && lib['name']) ? lib['name'] : lib.to_s
+          raise Arli::Errors::LibraryNotFound, 'Error: '.bold.red +
+              "Library #{lib_output.yellow} ".red + "was not found.\n\n".red +
+              %Q[  HINT: run #{"arli search 'name: /#{lib_output}/'".green}\n] +
+              %Q[        to find the exact name of the library you are trying\n] +
+              %Q[        to install. Alternatively, provide a url: field.\n]
+        end
+      end
+    end
 
+    def make_lib(lib)
+      ::Arli::Library::SingleVersion.new(library_model(lib))
+    end
   end
 end
 
-require_relative 'library/proxy'
-require_relative 'library/installer'

data/lib/arli/library/installer.rb

@@ -1,12 +1,12 @@
 require 'forwardable'
 require 'arli'
 require 'arli/actions'
-require_relative 'proxy'
+require_relative 'single_version'
 
 module Arli
   module Library
     class Installer
-      include ::Arli::Output
+      include ::Arli::Helpers::Output
 
       extend Forwardable
       def_delegators :@library, :exists?

data/lib/arli/library/multi_version.rb

@@ -0,0 +1,153 @@
+require 'forwardable'
+require 'arli'
+require 'arli/actions'
+require_relative 'single_version'
+
+module Arli
+  module Library
+    class MultiVersion
+      class << self
+        def format_methods
+          new({}).methods.grep(/^to_s_/).map { |m| m.to_s.gsub(/^to_s_/, '') }.map(&:to_sym)
+        end
+      end
+
+      attr_accessor :latest_version_library, :versions
+
+      include ::Arli::Helpers::Output
+
+      def ==(other)
+        other.instance_of?(self.class) && self.name == other.name
+      end
+
+      alias_method :eql?, :==
+      alias_method :lib, :latest_version_library
+      alias_method :lib=, :latest_version_library=
+
+      def initialize(a_lib = nil, versions = [])
+        Colored2.disable! if Arli.config.no_color
+        self.latest_version_library = a_lib if a_lib
+        self.versions               = versions || []
+        self.versions << a_lib.version if (a_lib && a_lib.respond_to?(:version) && self.versions.empty?)
+      end
+
+      def add_version(library: nil)
+        if library
+          if lib.nil? || library.version_to_i > lib.version_to_i
+            self.latest_version_library = library
+          end
+          self.versions << library.version
+        elsif version
+          self.versions << library.version
+        end
+        normalize_version_array!
+      end
+
+      def name
+        latest_version_library.name
+      end
+
+      def hash
+        lib.name.hash
+      end
+
+      # Various print formats
+      # --format <ARG> is inserted after "to_s_<format>"
+      def to_s_with_versions(limit = 4)
+        append do |out|
+          out << library_name
+          out << append_truncated_version_list(limit)
+        end
+      end
+
+      def to_s_long
+        lib_versions = versions.clone
+        latest       = lib_versions.pop
+        append do
+              "\n"
+              "Name:        #{lib.name.bold.yellow}\n" +
+              "Versions:    #{latest.bold.yellow}, #{lib_versions.reverse.join(', ').green}\n" +
+              (lib.author ? "Author(s):   #{lib.author.red}\n" : '') +
+              (lib.website ? "Website:     #{lib.website.cyan}\n" : '') +
+              "Sentence:    #{(lib.sentence).blue}\n" +
+          ((lib.paragraph && (lib.paragraph != lib.sentence)) ?
+               "Description: #{reformat_wrapped(lib.paragraph).magenta}\n" : "\n")
+        end
+      end
+
+      def to_s_short
+        append do
+          printf append_name[0..45]
+          indent_cursor 48
+          printf append_latest_version
+          indent_cursor 60
+          printf append_total_versions
+        end
+      end
+
+      def to_s_json
+        append do
+          JSON.pretty_generate(lib.to_hash) + ","
+        end
+      end
+
+      def to_s_yaml
+        append do
+          YAML.dump(lib.to_hash)
+        end
+      end
+
+      private
+
+      def stream
+        @stream = StringIO.new
+      end
+
+      def append
+        stream.tap do |out|
+          out << yield if block_given?
+        end.string
+      end
+
+      def append_architecture
+        unless lib.architectures.empty? || lib.architectures.include?('*')
+          append { "supports: #{lib.architectures.join(', ').bold.green}" }
+        end
+      end
+
+      def append_name
+        append { "#{lib.name.magenta}" }
+      end
+
+      def append_author
+        append { "by #{lib.author.blue}" }
+      end
+
+      def append_latest_version
+        latest = versions.clone.pop
+        append { " (#{latest.cyan})" }
+      end
+
+      def append_total_versions
+        append { "(#{sprintf("%2d", versions.size)} total versions )".green}
+      end
+
+      def append_truncated_version_list(limit)
+        append { truncate_version_list(limit) }
+      end
+
+      def normalize_version_array!
+        self.versions = versions.flatten.compact.uniq.sort
+      end
+
+      def reformat_wrapped(s, width=70)
+        s.gsub(/\s+/, ' ').gsub(/(.{1,#{width}})( |\Z)/, "\\1\n             ")
+      end
+
+      def truncate_version_list(limit)
+        suffix = lib.versions.size >= limit ? '...' : ''
+        "(#{lib.versions.size} versions: #{lib.versions.reverse[0..limit].join(', ').blue}#{suffix})"
+      end
+    end
+  end
+end

data/lib/arli/library/{proxy.rb → single_version.rb}

@@ -1,11 +1,14 @@
-require_relative 'installer'
+require 'awesome_print'
 require 'arli/errors'
 
+require_relative 'installer'
+require_relative 'multi_version'
+
 module Arli
   module Library
     # Represents a wrapper around Arduino::Library::Model instance
     # and decorates with a few additional helpers.
-    class Proxy
+    class SingleVersion
       attr_accessor :lib,
                     :lib_dir,
                     :canonical_dir,
@@ -49,23 +52,6 @@ module Arli
         Dir.exist?(path)
       end
 
-      # Formats
-      def to_s_short
-        "#{lib.name.bold.blue} (#{lib.version.yellow}), by #{lib.author.magenta}"
-      end
-
-      def to_s_json
-        puts lib.to_json
-      end
-
-      def to_s_long
-        "#{lib.name.bold.blue} (#{lib.version.yellow}), by #{lib.author.magenta}}\n\t#{lib.description}"
-      end
-
-      def to_s_pretty(lib, **options)
-        "#{lib.name.bold.blue} (#{lib.version.yellow}), by #{lib.author.magenta}"
-      end
-
       def method_missing(method, *args, &block)
         if lib && lib.respond_to?(method)
           lib.send(method, *args, &block)
@@ -73,7 +59,6 @@ module Arli
           super(method, *args, &block)
         end
       end
-
     end
   end
 end

data/lib/arli/lock/file.rb

@@ -17,9 +17,9 @@ module Arli
 
       def initialize(config: Arli.config)
         self.config         = config
-        self.lock_file_path = "#{config.arlifile.path}/#{config.arlifile.lock_name}"
         self.format         = config.arlifile.lock_format
         self.formatter      = set_formatter(format)
+        self.lock_file_path = "#{config.arlifile.path}/#{config.arlifile.name}.#{formatter.extension}"
         self.file           = ::File.open(lock_file_path, 'w')
 
         append(formatter.header)
@@ -41,7 +41,6 @@ module Arli
         append(formatter.footer)
       ensure
         file.close
-        FileUtils.cp(lock_file_path, "#{lock_file_path}.#{format}")
       end
 
       def append(line = nil)

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

@@ -1,8 +1,12 @@
+require 'arli/helpers/inherited'
 
 module Arli
   module Lock
     module Formats
       class Base
+        include Arli::Helpers::Inherited
+        attr_assignable :extension
+
         attr_accessor :lock_file
 
         def initialize(lock_file)
@@ -20,6 +24,10 @@ module Arli
         # Optional footer
         def footer
         end
+
+        def extension
+          self.class.extension
+        end
       end
     end
   end

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

@@ -4,19 +4,35 @@ module Arli
   module Lock
     module Formats
       class Cmake < Base
+        extension :cmake
+
+
+        attr_accessor :libs, :comments
 
         def header
-          "# vi:syntax=cmake\n" +
-          "set(ARLI_LIBRARIES)"
+          @comments = []
+          @libs = []
+          "# vi:syntax=cmake"
         end
 
         def format(library)
-          "# Library #{library.name}, version #{library.version}, url: #{library.url}\n" +
-              "prepend(ARDUINO_ARLI_LIBS ${ARDUINO_ARLI_LIBS} #{library.canonical_dir})"
+          @libs << library
+          @comments << "# Library #{library.name}:\n# version #{library.version}\n#    url: #{library.url}"
+          nil
         end
 
         def footer
-          "set(ARLI_LIBRARIES $ARLI_LIBRARIES PARENT_SCOPE)"
+          %Q[
+# This file is auto-generated by Arli library manager.
+# See https://github.com/kigster/arli for more info.
+
+set(ARLI_LIBRARIES_PATH "#{Arli.config.libraries.path}")
+set(ARLI_LIBRARIES #{@libs.map(&:canonical_dir).join(' ')})
+
+set(ARLI_LIBRARIES $ARLI_LIBRARIES PARENT_SCOPE)
+
+#{@comments.join("\n")}
+          ]
         end
       end
     end

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

@@ -4,6 +4,8 @@ module Arli
   module Lock
     module Formats
       class Json < Base
+        extension :json
+
         attr_accessor :hash
 
         def header

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

@@ -4,6 +4,8 @@ module Arli
   module Lock
     module Formats
       class Text < Base
+        extension :txt
+
         def format(library)
           "#{library.canonical_dir},#{library.version},#{library.path}"
         end

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

@@ -4,9 +4,11 @@ module Arli
   module Lock
     module Formats
       class Yaml < Json
+        extension :yml
+
         def footer
           "# vi:syntax=yaml\n" +
-          YAML.dump(hash)
+          YAML.dump(unique_libraries)
         end
       end
     end

data/lib/arli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arli
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arduino-library
@@ -38,6 +38,20 @@ 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: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rake_tasks~"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
@@ -252,9 +265,12 @@ files:
 - lib/arli/configuration.rb
 - lib/arli/errors.rb
 - lib/arli/extensions.rb
+- lib/arli/helpers/inherited.rb
+- lib/arli/helpers/output.rb
 - lib/arli/library.rb
 - lib/arli/library/installer.rb
-- lib/arli/library/proxy.rb
+- lib/arli/library/multi_version.rb
+- lib/arli/library/single_version.rb
 - lib/arli/lock/file.rb
 - lib/arli/lock/formats.rb
 - lib/arli/lock/formats/base.rb
@@ -262,7 +278,6 @@ files:
 - 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
 licenses:

data/.rake_tasks~

@@ -1,8 +0,0 @@
-build
-clean
-clobber
-doc
-install
-install:local
-release[remote]
-spec