discourse_theme 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8c45032d2c2499afcecc28d16ccee1fa98e8b2652080ab47736a900fa44d33
-  data.tar.gz: c4524cebcdfa477449c5419511ca9e39e8008b01cb6fef210705ffa851097ed8
+  metadata.gz: eda4efafe48fc1beeff142e2688d5c51faa2b5dd1d77baff286d19efb984d3a2
+  data.tar.gz: bcd2ad344cd37b116f7e499c941679256e48fa3dd95f82f8a51cd374de1f8168
 SHA512:
-  metadata.gz: a2670a5a54f209ed6819d5692dd492e7286110939a0add8dfc1b0510d9a25c1c4d619bcb2b9443ccb993e8c137073f53a673ea911ecef1f32058eca75b83119d
-  data.tar.gz: b51ae8876fbfbec7d49ea62246b76b40971eb25ed71b0aba631a9ec080c2e835f23eb1ae9795495820e6c755ddf54a24db9c03e4bb830e71b6fdde0c346827e7
+  metadata.gz: 8b466e0a9d50fcd6476645a6093e454d7bb2b6add37810c14f7ad40034e9877bc771afb7f4699b8058b61c9b1dd34c4ace50ed83e5ab10851b2b66d69ee026b0
+  data.tar.gz: d87e7931724b2b74a9d6a6bef786522edc564e5cbe727ab578bdc43d99d7ab52bc4cca20a76fc7a07f03c40cf1394f3853078342451c9981b9b4aa6bc4ec4043

data/lib/discourse_theme/client.rb

@@ -12,13 +12,33 @@ module DiscourseTheme
 
       @is_theme_creator = !!(THEME_CREATOR_REGEX =~ @url)
 
-      parts = discourse_version.split(".").map { |s| s.sub('beta', '').to_i }
-      if parts[0] < 2 || parts[1] < 2 || parts[2] < 0 || (!parts[3].nil? && parts[3] < 10)
-        Cli.info "discourse_theme is designed for Discourse 2.2.0.beta10 or above"
+      if !self.class.has_needed_version?(discourse_version, "2.3.0.beta1")
+        Cli.info "discourse_theme is designed for Discourse 2.3.0.beta1 or above"
         Cli.info "download will not function, and syncing destination will be unpredictable"
       end
     end
 
+    # From https://github.com/discourse/discourse/blob/master/lib/version.rb
+    def self.has_needed_version?(current, needed)
+      current_split = current.split('.')
+      needed_split = needed.split('.')
+
+      (0..[current_split.size, needed_split.size].max).each do |idx|
+        current_str = current_split[idx] || ''
+
+        c0 = (needed_split[idx] || '').sub('beta', '').to_i
+        c1 = (current_str || '').sub('beta', '').to_i
+
+        # beta is less than stable
+        return false if current_str.include?('beta') && (c0 == 0) && (c1 > 0)
+
+        return true if c1 > c0
+        return false if c0 > c1
+      end
+
+      true
+    end
+
     def get_themes_list
       endpoint = root +
         if @is_theme_creator

data/lib/discourse_theme/uploader.rb

@@ -1,84 +1,83 @@
-class DiscourseTheme::Uploader
+module DiscourseTheme
+  class Uploader
 
-  THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
+    THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
 
-  def initialize(dir:, client:, theme_id: nil)
-    @dir = dir
-    @client = client
-    @theme_id = theme_id
-  end
+    def initialize(dir:, client:, theme_id: nil)
+      @dir = dir
+      @client = client
+      @theme_id = theme_id
+    end
 
-  def compress_dir(gzip, dir)
-    sgz = Zlib::GzipWriter.new(File.open(gzip, 'wb'))
-    tar = Archive::Tar::Minitar::Output.new(sgz)
+    def compress_dir(gzip, dir)
+      sgz = Zlib::GzipWriter.new(File.open(gzip, 'wb'))
+      tar = Archive::Tar::Minitar::Output.new(sgz)
 
-    Dir.chdir(dir + "/../") do
-      Find.find(File.basename(dir)) do |x|
-        Find.prune if File.basename(x) == "src"
-        Find.prune if File.basename(x)[0] == ?.
-        next if File.directory?(x)
+      Dir.chdir(dir + "/../") do
+        Find.find(File.basename(dir)) do |x|
+          Find.prune if File.basename(x) == "src"
+          Find.prune if File.basename(x)[0] == ?.
+          next if File.directory?(x)
 
-        Minitar.pack_file(x, tar)
+          Minitar.pack_file(x, tar)
+        end
       end
+    ensure
+      tar.close
+      sgz.close
     end
-  ensure
-    tar.close
-    sgz.close
-  end
 
-  def diagnose_errors(json)
-    count = 0
-    json["theme"]["theme_fields"].each do |row|
-      if (error = row["error"]) && error.length > 0
-        if count == 0
-          puts
+    def diagnose_errors(json)
+      count = 0
+      json["theme"]["theme_fields"].each do |row|
+        if (error = row["error"]) && error.length > 0
+          count += 1
+          Cli.error ""
+          Cli.error "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
+          Cli.error ""
         end
-        count += 1
-        Cli.error
-        Cli.error "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
-        Cli.error
       end
+      count
     end
-    count
-  end
 
-  def upload_theme_field(target: , name: , type_id: , value:)
-    raise "expecting theme_id to be set!" unless @theme_id
+    def upload_theme_field(target: , name: , type_id: , value:)
+      raise "expecting theme_id to be set!" unless @theme_id
 
-    args = {
-      theme: {
-        theme_fields: [{
-          name: name,
-          target: target,
-          type_id: type_id,
-          value: value
-        }]
+      args = {
+        theme: {
+          theme_fields: [{
+            name: name,
+            target: target,
+            type_id: type_id,
+            value: value
+          }]
+        }
       }
-    }
 
-    response = @client.update_theme(@theme_id, args)
-    json = JSON.parse(response.body)
-      if diagnose_errors(json) != 0
-        Cli.error "(end of errors)"
-      end
-  end
+      response = @client.update_theme(@theme_id, args)
+      json = JSON.parse(response.body)
+        if diagnose_errors(json) != 0
+          Cli.error "(end of errors)"
+        end
+    end
 
-  def upload_full_theme
-    filename = "#{Pathname.new(Dir.tmpdir).realpath}/bundle_#{SecureRandom.hex}.tar.gz"
-    compress_dir(filename, @dir)
+    def upload_full_theme
+      filename = "#{Pathname.new(Dir.tmpdir).realpath}/bundle_#{SecureRandom.hex}.tar.gz"
+      compress_dir(filename, @dir)
 
-    File.open(filename) do |tgz|
-      response = @client.upload_full_theme(tgz, theme_id: @theme_id)
+      File.open(filename) do |tgz|
+        response = @client.upload_full_theme(tgz, theme_id: @theme_id)
 
-      json = JSON.parse(response.body)
-      @theme_id = json["theme"]["id"]
-      if diagnose_errors(json) != 0
-        Cli.error "(end of errors)"
+        json = JSON.parse(response.body)
+        @theme_id = json["theme"]["id"]
+        if diagnose_errors(json) != 0
+          Cli.error "(end of errors)"
+        end
+        @theme_id
       end
-      @theme_id
+    ensure
+      FileUtils.rm_f filename
     end
-  ensure
-    FileUtils.rm_f filename
-  end
 
+  end
 end

data/lib/discourse_theme/version.rb

@@ -1,3 +1,3 @@
 module DiscourseTheme
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler