arli 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0abe9044357d7bff2eab6f8cd87b80b729aebc9a
-  data.tar.gz: ce3df76a7613eccd2d7ada2426400fd4084b7724
+SHA256:
+  metadata.gz: 5cbff710fa5c642b1c785d3e5f57acd716383c27a5638ce1164ac4539c655706
+  data.tar.gz: 36918da039ee3f764296e3d6073af80a89d39690199ef6e80b4a15d8ed310929
 SHA512:
-  metadata.gz: b7f6aaed86211c89a35b9da9c0083c4daf9d01d4b3a1d3d6ff39cdcc577a9f1d091c25dd7ddb62ce681568879fe72b6755641fb1c7d3a067ecbfb2e8d4daec6a
-  data.tar.gz: 26ebf7fdfc17fcf40ac043e0b7e7c95960c8c84d1f7a3239e6b575a354c181b7b9cd688f3dda56b827cdb74c37d13d7da91fcc08f6bc75487e3bf089fae94f74
+  metadata.gz: 9b73273990d8bd70ad20f1925068060bb486b74535a75f69c42ab01789502cefb555255745d6c12a805faf7778ab6851e6c68686517e2ed7b8db15738cf41af9
+  data.tar.gz: 89f52802678e11a45f2f2a6424f0aa08d4e2fde5bdcdfaf7edc8230e65fd1d0c6c75d93bc702ddc748cc956fcae710f8e0170f29d74a8ea150c48d153513c8fb

data/lib/arli/actions/action.rb

@@ -13,9 +13,12 @@ module Arli
       extend Forwardable
       def_delegators :@library,
                      :exists?,
-                     :path, :temp_path,
-                     :dir, :temp_dir,
-                     :libraries_home
+                     :path,
+                     :temp_path,
+                     :dir,
+                     :temp_dir,
+                     :libraries_home,
+                     :folder
 
       class << self
         def inherited(base)

data/lib/arli/actions/move_to_library_path.rb

@@ -15,7 +15,12 @@ module Arli
           if Dir.exist?(temp_path) && !Dir.exist?(path)
             FileUtils.mkdir_p(File.dirname(path))
             ___ "current: #{Dir.pwd.yellow}\ntemp_path: #{temp_path.yellow}\nlibrary_path: #{path.yellow}\n" if debug?
-            mv(temp_path, path)
+            if folder && Dir.exist?("#{temp_path}/#{folder}")
+              mv("#{temp_path}/#{folder}", path)
+              FileUtils.rm_rf(temp_path)
+            else
+              mv(temp_path, path)
+            end
           elsif Dir.exist?(path)
             raise ::Arli::Errors::InstallerError,
                   "Directory #{path} was not expected to still be there!"

data/lib/arli/commands/install.rb

@@ -12,6 +12,7 @@ module Arli
   module Commands
     class Install < Base
       require 'arduino/library/include'
+      include Arduino::Library::InstanceMethods
 
       attr_accessor :library,
                     :arlifile,
@@ -47,22 +48,24 @@ module Arli
       def identify_library(arg)
         results = if arg =~ %r[https?://]i
                     self.install_method = :url
-                    r                   = search(url: /^#{arg}$/i)
-                    if r.empty?
+                    result = search url: /^#{arg}$/i
+
+                    if result.empty?
                       self.install_method = :website
-                      r                   = search(website: /^#{arg}$/i)
+                      result = search(website: /^#{arg}$/i)
                     end
-                    if r.empty?
+
+                    if result.empty?
                       self.install_method = :custom
-                      r                   = [Arduino::Library::Model.from_hash(url: arg, name: File.basename(arg))]
+                      result = [Arduino::Library::Model.from_hash(url: arg, name: File.basename(arg))]
                     end
-                    r
+                    result
                   elsif File.exist?(arg) || arg =~ /\.zip$/
                     self.install_method = :archiveFileName
-                    search(archiveFileName: "#{File.basename(arg)}")
+                    search archiveFileName: "#{File.basename(arg)}"
                   else
                     self.install_method = :name
-                    search(name: /^#{arg}$/)
+                    search name: /^#{arg}$/
                   end
 
         validate_search(arg, results)
@@ -77,6 +80,11 @@ module Arli
         #
       end
 
+      def search(**opts)
+        # noinspection RubyArgCount
+        super(opts)
+      end
+
       private
 
       def validate_search(arg, results)

data/lib/arli/helpers/inherited.rb

@@ -36,6 +36,7 @@ module Arli
       end
 
       def self.included(base)
+        # This works for both classes and modules
         base.instance_eval do
           class << self
             include(::Arli::Helpers::Inherited::ClassMethods)

data/lib/arli/library.rb

@@ -5,7 +5,7 @@ require 'arli/errors'
 
 module Arli
   module Library
-    ADDITIONAL_KEYS = %i(depends headers_only)
+    ADDITIONAL_KEYS = %i(depends headers_only folder)
 
     def library_model(lib)
       return lib if lib.is_a?(::Arduino::Library::Model)

data/lib/arli/library/single_version.rb

@@ -16,7 +16,8 @@ module Arli
 
       # Additional attributes that can be set via Arlifile
       attr_accessor :headers_only,
-                    :depends
+                    :depends,
+                    :folder # indicates a sub-folder of the library
 
       def initialize(lib, config: Arli.config)
         self.lib          = lib
@@ -24,6 +25,7 @@ module Arli
         self.lib_dir      = lib.name.gsub(/ /, '_')
         self.headers_only = false
         self.depends      = nil
+        self.folder       = nil
       end
 
       def install

data/lib/arli/version.rb

@@ -1,3 +1,3 @@
 module Arli
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arduino-library
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: This is an Arduino helper toolkit that builds on top of the arduino-cmake