pagiii 0.0.10 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7755458ae3c0f870ffa2ce9a4b399af7e63b27434f519f4b234105de4012dea5
-  data.tar.gz: 1f776e5bd611222b26a6a42896176ff4860213a5b18e2cac902fbc3d59265740
+  metadata.gz: cfaa4ea7a12fa55eb6c25f09edd7d7af72cb0cb941ca6484d01771a15f6585b9
+  data.tar.gz: 39ef43287e308e86601181ef3ed9cac9626344fe974ae63eda91c28d46c24635
 SHA512:
-  metadata.gz: 79cd11e255f1b395896422be70bf2a9e1fcc421508ff03c0fb549a14a3bfadf6399a667e337cd69d292b0498a7a9b978844bfc6aea29eac6fcbefcfe24231a4f
-  data.tar.gz: f1fdde170d73890991b3cc26a4ca50ad4d7ebc9f798f4eeaa919a665a184f8cf2fe36a21737d485199ba2334436ac2eb491a81ce9489bac9c164b3a7d69e66ff
+  metadata.gz: b7e04eb945f09eb79f4e11b0de238cc0c84a0c140aa2644e9e140018d297624bb907cb3abb3577064e0223708ad20f5d566e02c47bee9b099191b254b16cf5c5
+  data.tar.gz: f0cc199c4f1905f7bc0ba84f68d202a64ea36e2e26c14a4d4497db909b6599a97bbd5717645bc18edd43ab5934f2e7fba3f105c36e275caf04f1301172bb3100

data/bin/pagiii

@@ -19,7 +19,7 @@ secret_id = 'WlENailhg7KEbZqXXwX4Y470HYGL8-U2af_bOZGVWeQ'
 redirect_uri = 'http://localhost:7654'
 scope = 'read_theme write_theme delete_theme'
 
-program :version, '0.0.10'
+program :version, '0.1.2'
 program :description, 'Pagiii CLI'
 
 
@@ -49,7 +49,7 @@ def check_authorized(response)
   end
 end
 
-def update_config(site_name, token)
+def update_config(email, password)
   dir = "#{Dir.home}/.pagiii"
   FileUtils.mkdir_p(dir) unless Dir.exists?(dir)
   file = File.join(dir, 'config.json')
@@ -57,19 +57,21 @@ def update_config(site_name, token)
   if File.exists?(file)
     hash = JSON.parse(IO.read(file))    
   end
-  hash[site_name] = token
+  hash[:email] = email
+  hash[:password] = password
+  
   File.open(file, 'w+') do |f|
     f.write(hash.to_json)
   end
 end
 
-def read_config(site_name)
+def read_config
   dir = "#{Dir.home}/.pagiii"
   return nil unless Dir.exists?(dir)
   file = File.join(dir, 'config.json')
   return nil unless File.exists?(file)
   hash = JSON.parse(IO.read(file))
-  hash[site_name]
+  hash
 end
 
 command :help do |c|
@@ -78,39 +80,66 @@ command :help do |c|
   end
 end
 
+command 'login' do |c|
+  c.action do
+    email = ask("Email: ")
+    password = ask("Password: "){|q| q.echo = '*'}
+    url = "#{root_api}/api/v1/admin/auth"
+    conn = Faraday.new(
+      url: url,
+      params: {},
+      headers: {
+        'Content-Type' => 'application/json'
+      }
+    )
+    response = conn.post do |req|      
+      req.body = {email: email, password: password}.to_json
+    end    
+    if response.status == 200
+      api_token = JSON.parse(response.body)['api_token']
+      update_config(email, api_token)
+      puts "logged as #{email}"
+    else
+      message = JSON.parse(response.body)['message']
+      say "login failed http [#{message}]"
+    end
+  end
+end
+
+command 'site:list' do |c|
+  c.action do
+    user = read_config    
+    site_info = Pagiii::SiteInfo.new(token: user['password'], root_api: root_api)
+    site_info.list
+  end
+end
+
 
 # bundle exec ruby pagiii.rb theme:sync --site=dokumentasi --theme=doc
 command 'theme:sync' do |c|
   c.option '--theme STRING', String, 'Theme name'
   c.option '--site STRING', String, 'Site name'
   c.action do |args, options|
-    if options.theme.nil?
-      say "please specify theme name using --theme option"
-      exit(false)
-    elsif options.site.nil?
+    if options.site.nil?
       say "please specify site name using --site option"
       exit(false)
     end
-    token = read_config(options.site)
-    theme = Pagiii::ThemeSync.new(token: token, root_api: root_api)    
-    theme.sync_all(options.theme)
+    user = read_config
+    theme = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)    
+    theme.sync_all(options.site)
   end
 end
 
 command 'theme:watch' do |c|
-  c.option '--site STRING', String, 'Site name'
-  c.option '--theme STRING', String, 'Theme name'  
-  c.action do |args, options|
-    if options.theme.nil?
-      say "please specify theme name using --theme option"
-      exit(false)
-    elsif options.site.nil?
+  c.option '--site STRING', String, 'Site name'  
+  c.action do |args, options|    
+    if options.site.nil?
       say "please specify site name using --site option"
       exit(false)
     end
-    token = read_config(options.site)
-    theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-    theme_sync.watch(options.theme)
+    user = read_config
+    theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+    theme_sync.watch(options.site)
   end
 end
 
@@ -121,13 +150,13 @@ command 'theme:create' do |c|
   c.option '--theme STRING', String, 'Theme name'
 
   c.action do |args, options|
-    token = read_config(options.site)
+    user = read_config
     if options.theme.nil?
       say "please specify theme name using --theme option"
     else
       say "Create theme #{options.theme}"
-      theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-      response = theme_sync.create_theme(options.theme)      
+      theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+      response = theme_sync.create_theme(options.site, options.theme)      
       
       if response.status == 200
         say "theme created"
@@ -149,10 +178,10 @@ command 'theme:pull' do |c|
     elsif options.site.nil?
       say "please provide site name"
     else
-      token = read_config(options.site)
+      user = read_config
       say "Pull theme #{options.theme}"
-      theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-      theme_sync.pull_theme(options.theme)      
+      theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+      theme_sync.pull_theme(options.site, options.theme)      
     end
   end
 end
@@ -165,9 +194,10 @@ command 'theme:list' do |c|
     if options.site.nil?
       say "please provide name using --site"
     else
-      token = read_config(options.site)
-      theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-      theme_sync.list_themes
+      user = read_config
+      
+      theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+      theme_sync.list_themes(options.site)
     end
   end
 end
@@ -184,10 +214,10 @@ command 'theme:delete' do |c|
       say "please provide site name using --site"
     else
       say "Delete theme #{options.theme}"
-      token = read_config(options.site)
+      user = read_config
 
-      theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-      theme_sync.delete_theme(options.theme)      
+      theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+      theme_sync.delete_theme(options.site, options.theme)      
     end
   end
 end
@@ -205,9 +235,9 @@ command 'theme:set_current' do |c|
       say "please provide name using --site"
     else
       say "Set current theme of #{options.site} to #{options.theme}"
-      token = read_config(options.site)      
-      theme_sync = Pagiii::ThemeSync.new(token: token, root_api: root_api)
-      theme_sync.set_current_theme(options.theme)      
+      user = read_config    
+      theme_sync = Pagiii::ThemeSync.new(token: user['password'], root_api: root_api)
+      theme_sync.set_current_theme(options.site, options.theme)      
     end
   end
 end

data/lib/pagiii/site_info.rb

@@ -0,0 +1,31 @@
+module Pagiii
+  class SiteInfo
+    def initialize(token:, root_api:)
+      @token = token
+      @root_api = root_api
+    end
+
+    def list
+      conn = Faraday.new(
+        url: "#{@root_api}/api/v1/admin/sites",
+        headers: {
+          'Content-Type' => 'application/json',
+          'api-token' => @token
+        }
+      )    
+      response = conn.get
+      # check_authorized(response)
+      if response.status == 200        
+        organizations = JSON.parse(response.body)
+        organizations.each do |o|
+          puts "Organization: #{o['name']}"
+          o['sites'].each do |site|
+            puts "  #{site['name']}"
+          end
+        end        
+      else
+        say "unknown error"
+      end      
+    end
+  end
+end

data/lib/pagiii/theme_sync.rb

@@ -10,12 +10,12 @@ class Pagiii::ThemeSync
     @root_api = root_api
   end
 
-  def list_themes
+  def list_themes(site_name)
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes",
+      url: "#{root_api}/api/v1/admin/themes?site_name=#{site_name}",
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )    
     response = conn.get
@@ -23,9 +23,9 @@ class Pagiii::ThemeSync
     if response.status == 200        
       hash = JSON.parse(response.body)
       say "List themes at #{hash['site']['name']}"
-      say "--------------------------------------"  
+      say "--------------------------------------"      
       hash['themes'].each do |theme|
-        say " - #{theme['name']}"
+        say " - #{theme['name']}  #{(theme['id'] == hash['current']['id'])? "(active)" : '' }"
       end
     else
       say "error"
@@ -33,14 +33,14 @@ class Pagiii::ThemeSync
   end
 
 
-  def sync_file(theme_name, file)
+  def sync_file(site, theme_name, file)
     #puts "sync #{file}"
     conn = Faraday.new(
       url: @root_api,
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
 
@@ -52,12 +52,12 @@ class Pagiii::ThemeSync
     else
       data = IO.read(file)
     end    
-    response = get_theme_by_name(name: theme_name)
+    response = get_theme_by_name(site: site, name: theme_name)
 
     check_authorized(response)
     theme_id = JSON.parse(response.body)['theme']['id']
 
-    response = conn.post("/api/v1/admin/themes/#{theme_id}/assets") do |req|
+    response = conn.post("/api/v1/admin/themes/#{theme_id}/assets?site_name=#{site}") do |req|
       req.params['limit'] = 100
       req.body = {
         key: get_asset_key(file),        
@@ -68,9 +68,9 @@ class Pagiii::ThemeSync
 
   
 
-  def sync_delete(theme_name, file)
+  def sync_delete(site, theme_name, file)
     puts "deleteing #{file}"
-    response = get_theme_by_name(name: theme_name)
+    response = get_theme_by_name(site: site, name: theme_name)
     check_authorized(response)
     theme_id = JSON.parse(response.body)['theme']['id']
     
@@ -79,15 +79,15 @@ class Pagiii::ThemeSync
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
-    response = conn.delete("/api/v1/admin/themes/#{theme_id}/assets?key=#{get_asset_key(file)}")
+    response = conn.delete("/api/v1/admin/themes/#{theme_id}/assets?key=#{get_asset_key(file)}&site_name=#{site}")
   end
 
-  def delete_remote(theme, asset_key)
+  def delete_remote(site, theme, asset_key)
     puts "deleting #{asset_key}"
-    response = get_theme_by_name(name: theme)
+    response = get_theme_by_name(site: site, name: theme)
     check_authorized(response)
     theme_id = JSON.parse(response.body)['theme']['id']
     
@@ -96,25 +96,25 @@ class Pagiii::ThemeSync
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
-    response = conn.delete("/api/v1/admin/themes/#{theme_id}/assets?key=#{asset_key}")
+    response = conn.delete("/api/v1/admin/themes/#{theme_id}/assets?key=#{asset_key}&site_name=#{site}")
   end
 
-  def compare_and_delete(theme)
+  def compare_and_delete(site, theme)
     conn = Faraday.new(
       url: @root_api,
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
-    response = get_theme_by_name(name: theme)
+    response = get_theme_by_name(site: site, name: theme)
     check_authorized(response)
     theme_id = JSON.parse(response.body)['theme']['id']
-    response = conn.get("/api/v1/admin/themes/#{theme_id}/assets")
+    response = conn.get("/api/v1/admin/themes/#{theme_id}/assets?site_name=#{site}")
     remote_assets = JSON.parse(response.body)['assets'].map{|x| x['asset_key']}
 
     local_assets = []
@@ -130,7 +130,7 @@ class Pagiii::ThemeSync
 
     assets_to_be_deleted = remote_assets - local_assets
     assets_to_be_deleted.each do |asset_key|
-      delete_remote(theme, asset_key)
+      delete_remote(site, theme, asset_key)
     end
   end
 
@@ -142,15 +142,17 @@ class Pagiii::ThemeSync
     "#{dir}/#{file}"    
   end
 
-  def sync_all(theme)
-    compare_and_delete(theme)    
+  def sync_all(site)
+    response = current_theme(site: site)
+    theme = JSON.parse(response.body)['theme']['name']
+    compare_and_delete(site, theme)    
     Dir.entries('.').each do |dir|
       if ALLOWED_DIRS.include?(dir) && File.directory?(dir)
         puts "--#{dir}"
         Dir.entries(dir).reject{|x| [".", ".."].include?(x)}.each do |file|
           print "----#{file}"          
           file_path = "./#{dir}/#{file}"                    
-          resp = sync_file(theme, file_path)
+          resp = sync_file(site, theme, file_path)
           if resp.status == 200
             puts " [OK]"
           else
@@ -162,44 +164,56 @@ class Pagiii::ThemeSync
     end
   end
 
-  def watch(theme_name)
+  def watch(site)
+    response = current_theme(site: site)
+    theme_name = JSON.parse(response.body)['theme']['name']
     Filewatcher.new(ALLOWED_DIRS).watch do |changes|
       changes.each do |filename, event|
         puts "#{filename} #{event}"        
         if event == :updated || event == :created
-          sync_file(theme_name, filename)
+          sync_file(site, theme_name, filename)
         elsif event == :deleted
-          sync_delete(theme_name, filename)
+          sync_delete(site, theme_name, filename)
         end
       end
     end
   end
 
-  def get_theme_by_name(name:)
+  def get_theme_by_name(site:, name:)
     conn = Faraday.new(
-      url: "#{@root_api}/api/v1/admin/themes/by_name?name=#{name}",    
+      url: "#{@root_api}/api/v1/admin/themes/by_name?name=#{name}&site_name=#{site}",    
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
+      }
+    )
+    response = conn.get
+  end
+
+  def current_theme(site:)
+    conn = Faraday.new(
+      url: "#{@root_api}/api/v1/admin/themes/current?site_name=#{site}",    
+      headers: {
+        'Content-Type' => 'application/json',
+        'api-token' => @token
       }
     )
-    
     response = conn.get
   end
 
   
 
-  def pull_theme(name)
-    response = get_theme_by_name(name: name)
+  def pull_theme(site, name)
+    response = get_theme_by_name(site: site, name: name)
     check_authorized(response)
     parsed_response = JSON.parse(response.body)
 
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}/pull",
+      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}/pull?site_name=#{site}",
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
     response = conn.get
@@ -208,7 +222,7 @@ class Pagiii::ThemeSync
 
     assets.each do |asset|
       say "downloading #{asset['asset_key']}"
-      response = download_asset(theme_id: parsed_response['theme']['id'], key: asset['asset_key'])
+      response = download_asset(site: site, theme_id: parsed_response['theme']['id'], key: asset['asset_key'])
       path = File.split(asset['asset_key'])
       FileUtils.mkdir(path.first) unless Dir.exists?(path.first)
       File.open(asset['asset_key'], 'wb') do |f|
@@ -223,28 +237,28 @@ class Pagiii::ThemeSync
     end
   end
 
-  def delete_theme(name)
-    response = get_theme_by_name(name: name)
+  def delete_theme(site, name)
+    response = get_theme_by_name(site: site, name: name)
     check_authorized(response)
     parsed_response = JSON.parse(response.body)
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}",
+      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}?site_name=#{site}",
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
     response = conn.delete
   end
 
-  def create_theme(name)
+  def create_theme(site, name)
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes",
+      url: "#{@root_api}/api/v1/admin/themes?site_name=#{site}",
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
     response = conn.post do |req|
@@ -256,16 +270,16 @@ class Pagiii::ThemeSync
     end
   end
 
-  def set_current_theme(name)
-    response = get_theme_by_name(name: name)
+  def set_current_theme(site, name)
+    response = get_theme_by_name(site: site, name: name)
     check_authorized(response)
     parsed_response = JSON.parse(response.body)
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}/set_current",
+      url: "#{root_api}/api/v1/admin/themes/#{parsed_response['theme']['id']}/set_current?site_name=#{site}",
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
     response = conn.patch do |req|
@@ -275,13 +289,13 @@ class Pagiii::ThemeSync
 
   private
 
-  def download_asset(theme_id:, key:)
+  def download_asset(site:,theme_id:, key:)
     conn = Faraday.new(
-      url: "#{root_api}/api/v1/admin/themes/#{theme_id}/assets/download?key=#{key}",
+      url: "#{root_api}/api/v1/admin/themes/#{theme_id}/assets/download?key=#{key}&site_name=#{site}",
       params: {param: '1'},
       headers: {
         'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{@token}"
+        'api-token' => @token
       }
     )
     response = conn.get

data/lib/pagiii.rb

@@ -3,3 +3,4 @@ module Pagiii
 end
 
 require 'pagiii/theme_sync'
+require 'pagiii/site_info'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pagiii
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.2
 platform: ruby
 authors:
 - Sugiarto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
-dependencies: []
+date: 2023-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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'
 description: CLI to support themes on pagiii CMS
 email:
 - ugidmtest@gmail.com
@@ -21,6 +35,7 @@ files:
 - bin/pagiii
 - lib/pagiii.rb
 - lib/pagiii/info.rb
+- lib/pagiii/site_info.rb
 - lib/pagiii/theme_sync.rb
 homepage: http://rubygems.org/gems/pagiii
 licenses: