syclink 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 40ff743e0e2bae626b25f0588b883b9a4644e2e6
-  data.tar.gz: 8b4b75c663e46b204a9f9d49accb041ffdd512fd
+SHA256:
+  metadata.gz: ed4a3ff5243875f090239740417af2c31fbf320405212b18768c0e43b91ad70c
+  data.tar.gz: 1c99edda059bbc51b3ea2715054136dae767b62c329a172de2ae49c3a70a1f3e
 SHA512:
-  metadata.gz: f41f7033506333e002a2079ba1828be595fe32306c69d6c0e4058abd467fb6c0e93ada8bb38a1666d34a29fee913bf5b437385e2e8f6ba8ac1eb82384b282e17
-  data.tar.gz: f4d7e3934391b0fa7cd4a63a4234e1e69ad36e5dd5d56fa152ab8d763b3cc45b7e8d53a441a4d3f0a915870b8ca77a07206ac3ea635c678f1b8e646471054267
+  metadata.gz: 6d636b857f04488b901a04b48d5f522b2db686dcda7165970c1c20d1b18fdedaec4295b5d009ae175c6b4b926c80ad24aa4a951e42797c0cbed4eb6173e2efbc
+  data.tar.gz: d439e3ea09788c80becb9c73ee2583423b09833b523b85a3964c891ed60ff325c15f67c7ebb152f6d60e72fd529d28b7ea127340cf038022bf1b35b29584854b

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    syclink (0.1.4)
-      gli (= 2.13.1)
+    syclink (0.2.0)
+      gli (>= 2.22.0)
       sqlite3 (= 1.3.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    gli (2.13.1)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    gli (2.22.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     sass (3.4.15)
     sqlite3 (1.3.10)
 
@@ -30,6 +30,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec (= 3.3.0)
+  rspec (>= 3.13)
   sass (= 3.4.15)
   syclink!
+
+BUNDLED WITH
+   2.6.2

data/README.md

@@ -268,6 +268,9 @@ To import all files from `some-directory` call
 
     $ syclink import dir ~/some-directory/**/*
 
+A path given like ~/some-directory/ will be expanded to ~/some-directory/* which
+will read all files in the given directory, but not in sub-directories.
+
 If on Windows and the directory contains .URL-files the URL within the .URL-file
 will be used as the link target.
 

data/bin/syclink

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 require 'gli'
+require 'fileutils' 
+
 begin # XXX: Remove this begin/rescue before distributing your app
 require 'syclink'
 rescue LoadError
@@ -343,7 +345,7 @@ command :import do |c|
   c.command :mf do |s|
 
     s.action do |global_options,options,args|
-      unless File.exists? args[0]
+      unless File.exist? args[0]
         STDERR.puts <<-HERE.gsub(/^ {10}/, '')
           Error: #{args[0]} doesn't exist!
           Firefox stores its bookmarks in a SQLite3 database called
@@ -365,7 +367,7 @@ command :import do |c|
   c.command :gc do |s|
 
     s.action do |global_options,options,args|
-      unless File.exists? args[0]
+      unless File.exist? args[0]
         STDERR.puts <<-HERE.gsub(/^ {10}/, '')
           Error: #{args[0]} doesn't exist!
           Google Chrome stores its bookmarks in a JSON file called
@@ -401,7 +403,7 @@ command :import do |c|
     s.flag [:t, :tags]
 
     s.action do |global_options,options,args|
-      unless File.exists? args[0]
+      unless File.exist? args[0]
         STDERR.puts <<-HERE.gsub(/^ {10}/, '')
           Error: #{args[0]} doesn't exist!
           Internet Explorer stores its bookmarks in a directory structure.
@@ -427,6 +429,9 @@ command :import do |c|
     sub-directory
 
     PATH_TO_DIRECTORY/**/* will import all files and sub-directories
+
+    PATH_TO_DIRECTORY/ will be expanded to PATH_TO_DIRECTORY/* which will import
+    all files in the provided directory
   HERE
 
   c.arg_name 'PATH_TO_DIRECTORY'
@@ -447,8 +452,7 @@ command :import do |c|
     s.flag [:t, :tags]
 
     s.action do |global_options,options,args|
-      @designer.import_links(SycLink::FileImporter.new(args.shift,
-                                                       options))
+      @designer.import_links(SycLink::FileImporter.new(args, options))
     end
   end
 end
@@ -472,7 +476,7 @@ pre do |global,command,options,args|
     @designer = SycLink::Designer.new
     global[:website] ||= config[:default_website]
 
-    if File.exists? yaml_file(syclink_website_directory, global[:website])
+    if File.exist? yaml_file(syclink_website_directory, global[:website])
       @designer.load_website(yaml_file(syclink_website_directory, 
                                        global[:website]))
 

data/lib/syclink/designer.rb

@@ -2,6 +2,7 @@ require_relative 'website'
 require_relative 'link'
 require_relative 'infrastructure'
 require 'yaml'
+require 'fileutils'
 
 # Module that creates a link list and generates an html representation
 module SycLink
@@ -135,12 +136,12 @@ module SycLink
     # Loads a website based on the provided YAML-file and asigns it to the
     # designer to operate on
     def load_website(website)
-      @website = YAML.load_file(website)
+      @website = YAML.safe_load_file(website, permitted_classes: [SycLink::Website, SycLink::Link])
     end
 
     # Deletes the website if it already exists
     def delete_website(directory)
-      if File.exists? yaml_file(directory, website.title)
+      if File.exist? yaml_file(directory, website.title)
         FileUtils.rm(yaml_file(directory, website.title)) 
       end
     end

data/lib/syclink/file_importer.rb

@@ -2,10 +2,11 @@ module SycLink
 
   class FileImporter < Importer
 
+    GLOB_PATTERN = /^[^\*\?\[\]\{\}]*/
+
     def read
-      root_dir = File.dirname(path).scan(/^[^\*|\?]*/).first
-      regex = Regexp.new("(?<=#{root_dir}).*")
-      Dir.glob(path).map do |file|
+      regex = Regexp.new("(?<=#{root_dir(path)}).*")
+      files(path).map do |file|
         next if File.directory? file
         url, name = if File.extname(file).upcase == ".URL"
                       begin
@@ -24,6 +25,29 @@ module SycLink
       end.compact
     end
 
+    private
+
+    def files(path)
+      if path.is_a?(String)
+        Dir.glob(expand_to_glob(path))
+      elsif path.is_a?(Array)
+        path.size > 1 ? path : Dir.glob(expand_to_glob(path.first))
+      else
+        abort "Path #{path} is not a valid path"
+      end
+    end
+
+    def expand_to_glob(path)
+      File.directory?(path) ? File.expand_path("*", path) : path
+    end
+
+    def root_dir(path)
+      if path.is_a?(String) 
+        path 
+      else 
+        File.dirname(path.first)
+      end.scan(GLOB_PATTERN).first
+    end
   end
 
 end

data/lib/syclink/importer.rb

@@ -56,6 +56,8 @@ module SycLink
                                         .squeeze(" ")
                                         .split('/')
 
+      tags.reject! { |tag| tag.empty? }
+
       if tags.empty? || opts[:level] == 0
         "Default"
       else

data/lib/syclink/infrastructure.rb

@@ -1,4 +1,6 @@
 # Module that creates a link list and generates an html representation
+require 'fileutils'
+
 module SycLink
 
   # Helper methods to setup the infrastructure for syclink
@@ -6,21 +8,21 @@ module SycLink
 
     # Creates a directory if it does not exist
     def create_directory_if_missing(directory)
-      unless File.exists? directory
-        Dir.mkdir directory
+      unless File.exist? directory
+        FileUtils.mkdir_p directory
       end
     end
 
     # Copies a file to a target directory
     def copy_file_if_missing(file, to_directory)
-      unless File.exists? File.join(to_directory, File.basename(file))
+      unless File.exist? File.join(to_directory, File.basename(file))
         FileUtils.cp(file, to_directory)
       end
     end
 
     # Loads the configuration from a file
     def load_config(file)
-      unless File.exists? file
+      unless File.exist? file
         File.open(file, 'w') do |f| 
           YAML.dump({ default_website: 'default' }, f) 
         end

data/lib/syclink/version.rb

@@ -2,6 +2,6 @@
 module SycLink
 
   # Version of the application
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 
 end

data/setup.md

@@ -49,13 +49,18 @@ repository.
 Select the Ruby version
 =======================
 For a new project we want to use the newst Ruby version. At this writing it is
-verison 2.2.1. Suppose we use [RVM](https://rvm.io/). If not already installed
+verison 3.2.6. Suppose we use [RVM](https://rvm.io/). If not already installed
 we install it with
 
     $ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
     $ \curl -sSL https://get.rvm.io | bash -s stable
-    $ rvm install 2.2.1
-    $ rvm use 2.2.1
+    $ rvm install 3.2.6
+    $ rvm use 3.2.6
+
+Using [rbenv](https://github.com/rbenv/rbenv) we install ruby and select it for the directory 
+
+    $ rbenv install 3.2.6
+    $ rbenv local 3.2.6
 
 Install RSpec
 =============

data/spec/syclink/importer_spec.rb

@@ -39,19 +39,20 @@ module SycLink
 
       before do
         ie_directory = File.join(File.dirname(__FILE__), 'ie/')
+
         @result = [ [ "http://www.example.com/", "ie", "", "one" ],
                     [ "http://www.example.com/", "ie", "", "one,two"],
-                    [ "http://www.example.com/", "ie", "", "Default"] ]
+                    [ "http://www.example.com/", "ie", "", "Default"] ].sort
 
         @ie = InternetExplorer.new(ie_directory)
       end
 
       it "should import bookmarks" do
-        expect(@ie.read).to eq @result
+        expect(@ie.read.sort).to eq @result
       end
 
       it "should read rows" do
-        expect(@ie.rows).to eq @result
+        expect(@ie.rows.sort).to eq @result
       end
 
       it "should create links" do
@@ -115,7 +116,7 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
                        "two.pdf", "", "a"], 
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
-                       "one.pdf", "", "Default"]]
+                       "one.pdf", "", "Default"]].sort
         @pdf_zero = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf", 
                        "three.pdf", "", "Default"], 
                       ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
@@ -123,7 +124,7 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/a/two.pdf", 
                        "two.pdf", "", "Default"], 
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
-                       "one.pdf", "", "Default"]]
+                       "one.pdf", "", "Default"]].sort
         @txt_files = [["/home/pierre/Work/syclink/spec/syclink/fi/a.txt",
                        "a.txt", "", "Default"]]
         @any_files = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf",
@@ -137,7 +138,7 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
                        "one.pdf", "", "Default"], 
                       ["http://www.example.com/", 
-                       "ie", "", "c"]]     
+                       "ie", "", "c"]].sort
         @any_level = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf",
                        "three.pdf", "", "b"],
                       ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
@@ -149,7 +150,7 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
                        "one.pdf", "", "Default"], 
                       ["http://www.example.com/", 
-                       "ie", "", "c"]]     
+                       "ie", "", "c"]].sort
         @pdf_tags  = [["/home/pierre/Work/syclink/spec/syclink/fi/b/three.pdf",
                        "three.pdf", "", "Prime,Second"],
                       ["/home/pierre/Work/syclink/spec/syclink/fi/b/a/four.pdf",
@@ -161,12 +162,12 @@ module SycLink
                       ["/home/pierre/Work/syclink/spec/syclink/fi/one.pdf", 
                        "one.pdf", "", "Prime,Second"], 
                       ["http://www.example.com/", 
-                       "ie", "", "Prime,Second"]]     
+                       "ie", "", "Prime,Second"]].sort
       end
 
       it "should import pdf filenames" do
         fi = FileImporter.new(File.join(@file_dir, "**/*.pdf"))
-        expect(fi.read).to eq @pdf_files
+        expect(fi.read.sort).to eq @pdf_files
       end
 
       it "should import a fully qualified text-file" do
@@ -176,7 +177,7 @@ module SycLink
 
       it "should import any file" do
         fi = FileImporter.new(File.join(@file_dir, "**/*"))
-        expect(fi.read).to eq @any_files
+        expect(fi.read.sort).to eq @any_files
       end
 
       it "should read rows from pdf" do
@@ -196,18 +197,18 @@ module SycLink
 
       it "should use only the parent directory as the tag" do
         fi = FileImporter.new(File.join(@file_dir, "**/*"), level: 1)
-        expect(fi.read).to eq @any_level
+        expect(fi.read.sort).to eq @any_level
       end
 
       it "should not import tags" do
         fi = FileImporter.new(File.join(@file_dir, "**/*.pdf"), level: 0)
-        expect(fi.read).to eq @pdf_zero
+        expect(fi.read.sort).to eq @pdf_zero
       end
 
       it "should specify tags during import" do
         fi = FileImporter.new(File.join(@file_dir, "**/*"), 
                               level: 2, tags: "Prime,Second")
-        expect(fi.read).to eq @pdf_tags
+        expect(fi.read.sort).to eq @pdf_tags
       end
     end
 

data/syclink.gemspec

@@ -13,14 +13,13 @@ spec = Gem::Specification.new do |s|
   s.license = 'MIT license (MIT)'
   s.files = `git ls-files`.split(" ")
   s.require_paths << 'lib'
-  s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc','syclink.rdoc']
   s.rdoc_options << '--title' << 'test' << '--main' << 'README.rdoc' << '-ri'
   s.bindir = 'bin'
   s.executables << 'syclink'
   s.required_ruby_version = '>= 2.0'
-  s.add_development_dependency('rspec', '3.3.0')
+  s.add_development_dependency('rspec', '>= 3.13')
   s.add_development_dependency('sass', '3.4.15')
-  s.add_runtime_dependency('gli','2.13.1')
+  s.add_runtime_dependency('gli','>= 2.22.0')
   s.add_runtime_dependency('sqlite3','1.3.10')
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: syclink
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre Sugar
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +41,16 @@ dependencies:
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.22.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +207,6 @@ homepage: https://github.com/sugaryourcoffee/syclink
 licenses:
 - MIT license (MIT)
 metadata: {}
-post_install_message: 
 rdoc_options:
 - "--title"
 - test
@@ -229,9 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A link list html generator
 test_files: []