siteleaf 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046b60a59a32c75e4294c753c2593933a1cc4c7f4bd631d063680810f9c9c4ac
-  data.tar.gz: d5d9312cab00db6b14ad706420649f008bd12382d1a54f3ef030fb90601c0024
+  metadata.gz: 2bd0d1ce58e3d7f0059cd0139fac42e5111efc232ee2cf758dc541088c9cc49f
+  data.tar.gz: ed3a5393e428f18c0f86f0e0709e5f6ea57990512aff8dfe726233a1599bfde1
 SHA512:
-  metadata.gz: e1c28c75af43d0c5472d721dc228c76c553d3f1aecc688c0911862b226ddacb080d09f7d3051fd3f9daa92b1bccb313006ea717dc5846ccdd0d632b89a84037e
-  data.tar.gz: d6a2293493b93183677f2e287adcdd5be234c7a2115fda7d78461722bd2537c0e4cb3adfba55a8caef5a3e344e5baf1f3ddb3ec272db69a854d05eaff0623746
+  metadata.gz: f4510e656e0fd8ecfe51d46bc0548e2af4a351fc7d6d7f9f76a3d77db9c133042c742c3fef8a8717696bcff70a18cf0ebe8c6771ff9c7cf980e7c271b73e4a65
+  data.tar.gz: d03897ef87c4a63b09487ff843ad129940f63e5704e94054b9724b6ce63e96af60b1e19f4ccde4bf2379c3f44226a4498f6aaa568eaff66de0a2965ade0123d9

data/README.md

@@ -1,7 +1,7 @@
 <img alt="Siteleaf" src="https://learn.siteleaf.com/assets/images/logo.svg" width="10%">
 
-Siteleaf v2 Gem
-===============
+Siteleaf v2 Gem & CLI
+=====================
 
 - [Prerequisites](#prerequisites)
 - [Installation](#installation)
@@ -79,6 +79,12 @@ To download your theme (or the default theme for new sites) from Siteleaf, run t
 To publish your site changes to your hosting provider, run the following command:
 
     siteleaf publish
+
+**Clean unused uploads:**
+
+To check for unused uploads and tidy up disk space (runs locally):
+
+    siteleaf clean _uploads
     
 **For a full list of commands, run:**
 

data/bin/siteleaf

@@ -16,6 +16,7 @@ Commands:
   auth                Login in with your credentials
   c, config DOMAIN    Configure an existing directory
   n, new DOMAIN       Creates new site on siteleaf.net
+  clean               Clean up unused uploads
   pull                Pulls files for configured site from Siteleaf
   push                Pushes all files in dir to configured site
   publish             Publish website to hosting provider
@@ -93,7 +94,7 @@ def pull(site_id)
       puts path
     end
     print '(y/n)? '
-    if $stdin.gets.chomp == 'y'
+    if $stdin.gets.chomp.downcase == 'y'
       missing_files.each do |path|
         print "Deleting #{path}..."
         ::File.delete(path)
@@ -210,6 +211,42 @@ def preview(site_id, quiet = true)
   end
 end
 
+def clean(path = '_uploads')
+  searcher = if system('which ag', out: File::NULL)
+    ['ag', '-lQ']
+  else
+    puts "\nWarning: Silver Searcher not found, install for faster results (https://geoff.greer.fm/ag/)\n"
+    ['grep', '-lr']
+  end
+
+  puts "\nBuilding Jekyll site..."
+  system 'bundle exec jekyll build --future --unpublished --drafts'
+
+  puts "\nFinding unused files..."
+  unused = Dir.glob("#{path}/**/*").select do |file|
+    next unless File.file? file
+    escaped = Jekyll::URL.escape_path file
+
+    found = system(*searcher, escaped.sub(/^_/, '/'), '_site', out: File::NULL) ||
+            system(*searcher,    file.sub(/^_/, '/'), '_site', out: File::NULL)
+
+    if !found
+      puts file
+      true
+    end
+  end
+
+  if unused.length == 0
+    puts "\nNo unused files found."
+  else
+    puts "=> Delete above #{unused.length} file(s)? (y/n)"
+    if $stdin.gets.chomp.downcase == 'y'
+      FileUtils.rm unused
+      puts "=> #{unused.size} file(s) deleted."
+    end
+  end
+end
+
 def config(site)
   Siteleaf.save_settings({site_id: site.id}, '.siteleaf.yml')
   puts "=> Site configured."
@@ -325,6 +362,8 @@ begin
         import(file, quiet)
       end
     end
+  when 'clean'
+    ARGV[1] ? clean(ARGV[1]) : clean
   else
     puts "Error: `#{ARGV[0]}` command not found.\n"
     puts help

data/lib/siteleaf/role.rb

@@ -0,0 +1,12 @@
+module Siteleaf
+  class Role < Entity
+
+    attr_accessor :kind, :user_id, :site_id
+    attr_reader :id, :created_at, :updated_at
+
+    def create_endpoint
+      "sites/#{site_id}/roles"
+    end
+    
+  end
+end

data/lib/siteleaf/site.rb

@@ -48,6 +48,11 @@ module Siteleaf
       Job.new(id: result["job_id"]) if result
     end
 
+    def users
+      result = Client.get "#{entity_endpoint}/users"
+      result.map { |r| User.new(r) } if result.is_a? Array
+    end
+
     def full_url
       "http://#{domain}"
     end

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/siteleaf.rb

@@ -14,6 +14,7 @@ require 'siteleaf/document'
 require 'siteleaf/site'
 require 'siteleaf/source_file'
 require 'siteleaf/user'
+require 'siteleaf/role'
 require 'digest/sha1'
 require 'rbconfig'
 require 'uri'

data/siteleaf.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'httparty', '>= 0.16.0'
-  gem.add_dependency 'psych', '>= 2.1.0'
   gem.add_dependency 'jekyll', '>= 1.4.1'
   gem.add_dependency 'rack'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Siteleaf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.0
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +77,7 @@ files:
 - lib/siteleaf/git_hash.rb
 - lib/siteleaf/job.rb
 - lib/siteleaf/page.rb
+- lib/siteleaf/role.rb
 - lib/siteleaf/site.rb
 - lib/siteleaf/source_file.rb
 - lib/siteleaf/user.rb