kajabi_theme 0.2.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9352ef12ae197f6f659505bbcb9b68ae8b366671
-  data.tar.gz: 4df235168d41370dc14194330aef983d362e2c9f
+SHA256:
+  metadata.gz: a96c3071d92de9a6bcabff7851e4e10d3786b6e54c6212390a3e5c606c76c2a7
+  data.tar.gz: 4fc0ce5480f59157cabe1f75f1f9323b8a467e6dff3cfeddde7a97db13c89203
 SHA512:
-  metadata.gz: 4838ae748909f4a091145f7bee8309f09ca0bf6e548e37e735f46ed9f0d778530caa703c7386a3095d7235bcf2384300708866168ab14998db6e9eeb9f5c9f71
-  data.tar.gz: 360926518f8bf1a0cad028fb083cd46a0ad3505fa21322b6c822b10c16e27e9f387bed8a5badfce5d8dbf96f4082a5fae52541a353fe1eda3a7a1c17d53c3d53
+  metadata.gz: 0105b79a4be6393c42b703fa53516a734f8f5ed6ac4e14d838c4923b00e1cb87f207be0ed38236f45dbfdb038128ae68c568cddc8ca65881868b0abc4836ea7b
+  data.tar.gz: 7421d37fde804610d2442f393ce48c9ac3c32b5614d501a1067e798579a671765ed1a4119399210b641f2b37cc8003d6a511f808ad396d7e1949751baedf7836

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format progress
 --color

data/kajabi_theme.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor"
   spec.add_dependency "typhoeus"
-  spec.add_dependency "filewatcher"
+  spec.add_dependency "filewatcher", "~> 0.5.4"
+  spec.add_dependency "mime-types", "~> 3.1"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
 end

data/lib/kajabi_theme/cli.rb

@@ -12,7 +12,7 @@ module KajabiTheme
     include Thor::Actions
 
     FOLDERS=%w[config templates layouts sections snippets assets].freeze
-    ACCOUNT_SETTINGS_URL="https://app.newkajabi.com/admin/settings/account"
+    ACCOUNT_SETTINGS_URL="https://app.kajabi.com/admin/settings/account"
 
     attr_reader :name
     attr_reader :updated_at
@@ -20,20 +20,24 @@ module KajabiTheme
     attr_reader :presigned_post
 
     desc "sync", "Sync all files to Kajabi"
+    option :concurrency, type: :numeric, default: 20, desc: "Maximum simultaneous uploads", aliases: :c
     def sync(force=true)
+      self.concurrency = options[:concurrency]
       refresh!
       (force ? files : changed_files).each {|f| send_file(f)}
       hydra.run
     end
 
     desc "watch", "Sync and watch for changes"
+    option :concurrency, type: :numeric, default: 20, desc: "Maximum simultaneous uploads", aliases: :c
     def watch
+      self.concurrency = options[:concurrency]
       refresh!
       sync(false)
 
       say "Watching for file changes..."
 
-      Filewatcher.new(FOLDERS).watch do |filename|
+      FileWatcher.new(FOLDERS).watch do |filename|
         say "Change detected: #{filename}"
         send_file(filename)
         hydra.run
@@ -43,11 +47,23 @@ module KajabiTheme
     desc "configure", "Configure the current directory for syncing"
     def configure
       theme_id = ask("Kajabi Theme ID:")
-      api_key  = ask("API Key (#{ACCOUNT_SETTINGS_URL}):")
-      api_secret  = ask("API Secret (#{ACCOUNT_SETTINGS_URL}):")
+      api_key = ask("API Key (#{ACCOUNT_SETTINGS_URL}):")
+      api_secret = ask("API Secret (#{ACCOUNT_SETTINGS_URL}):")
+      cainfo = ask("CA Cert File (leave blank if you're unsure):")
+
+      if !cainfo.empty? && !File.exist?(File.expand_path(cainfo))
+        say "Unable to find '#{cainfo}' (skipping)", :yellow
+        cainfo = ""
+      end
 
       create_file "config.yml" do
-        { theme_id: theme_id, api_key: api_key, api_secret: api_secret }.to_yaml
+        {
+          theme_id: theme_id,
+          api_key: api_key,
+          api_secret: api_secret,
+          cainfo: cainfo,
+          ssl_verifypeer: true
+        }.to_yaml
       end
     end
 
@@ -65,7 +81,16 @@ module KajabiTheme
     end
 
     def host
-      @host ||= config[:host] || "https://app.newkajabi.com/"
+      @host ||= config[:host] || "https://app.kajabi.com/"
+    end
+
+    def concurrency
+      @concurrency || 20
+    end
+
+    def concurrency=(val)
+      val = val.to_i
+      @concurrency = val if val.positive?
     end
 
     def id
@@ -80,8 +105,26 @@ module KajabiTheme
       config[:api_secret]
     end
 
+    def ssl_verifypeer
+      config.fetch(:ssl_verifypeer, true)
+    end
+
+    def cainfo
+      config.fetch(:cainfo, "")
+    end
+
+    def ssl_options
+      { ssl_verifypeer: ssl_verifypeer }.tap do |options|
+        options[:cainfo] = File.expand_path(cainfo) unless cainfo.empty?
+      end
+    end
+
+    def proxy
+      config[:proxy]
+    end
+
     def hydra
-      @hydra ||= Typhoeus::Hydra.hydra
+      @hydra ||= Typhoeus::Hydra.new(max_concurrency: concurrency)
     end
 
     def http_credentials
@@ -117,7 +160,8 @@ module KajabiTheme
           say "Request timed out", :red
         elsif response.code == 0
           # Could not get an http response, something's wrong.
-          say "Request timed out", :red
+          say "Something went wrong: #{response.return_message}", :red
+          say "URL: #{response.request.url}", :red
         else
           # Received a non-successful http response.
           say "HTTP request failed: #{response.code.to_s} #{response.body.to_s}", :red
@@ -142,28 +186,40 @@ module KajabiTheme
     end
 
     def send_editable_file(file)
-      request = Typhoeus::Request.new(
-        assets_url,
+      options = {
+        proxy: proxy,
         userpwd: http_credentials,
         method: :put,
         headers: { "content-type" => "application/x-www-form-urlencoded" },
         body: { asset: { key: file, content: File.read(file) }}
+      }.merge(ssl_options)
+
+      request = Typhoeus::Request.new(
+        assets_url,
+        options
       )
+
       handle_request request do |response|
         say "Uploaded: #{file}", :green
       end
+
       hydra.queue(request)
       request
     end
 
     def send_asset_file(file)
       body = presigned_post["fields"]
-      request = Typhoeus::Request.new(
-        presigned_post["url"],
+      options = {
+        proxy: proxy,
         method: :post,
         body: body.merge("file" => File.open(file, "r"))
+      }.merge(ssl_options)
+
+      request = Typhoeus::Request.new(
+        presigned_post["url"],
+        options
       )
-      
+
       handle_request request do |response|
         say "Uploaded: #{file}", :green
       end

data/lib/kajabi_theme/util.rb

@@ -1,3 +1,5 @@
+require "mime/types"
+
 module KajabiTheme
   class Util
     def self.editable?(name)
@@ -9,7 +11,7 @@ module KajabiTheme
     def self.content_type(name)
       if name.end_with?(".woff2")
         "application/font-woff2"
-      elsif name.end_with?(".scss") || name.end_with?(".scss.liquid")
+      elsif name.end_with?(".css") || name.end_with?(".scss") || name.end_with?(".scss.liquid")
         "text/css"
       else
         MIME::Types.type_for(name.sub('.liquid', '')).first.content_type rescue "text/plain"

data/lib/kajabi_theme/version.rb

@@ -1,3 +1,3 @@
 module KajabiTheme
-  VERSION = "0.2.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kajabi_theme
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jeremy Saenz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,30 @@ dependencies:
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Command line tool to help with developing Kajabi themes. Provides some
   commands detect changes of local theme files and sync them with a theme on Kajabi
 email:
@@ -120,7 +148,7 @@ files:
 homepage: http://www.kajabi.co
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,9 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Command line tool for developing themes
 test_files: []