discourse_theme 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7463e33dfb0fdd1b383377b7a6a47149c15acf54bdf7cc095c1ca5bdeb4cab
-  data.tar.gz: 61570cd30caea545b9212b0a4d32b79728fe6965b6aba8e91ecfa8e3d8d5bcc8
+  metadata.gz: c652f5407703115888ee2c75b3e1caf69b1aa526fcaf124ab54a0024fc471fcf
+  data.tar.gz: ee147aaef2475063959ba39f3025bc27257dc9dd5bd4f4d89b89dde0e4bcb4ed
 SHA512:
-  metadata.gz: 7ccd6dd6a930061d111a7fb412753de1d21001175a51eebdbdd6e9bcb29c6bdbaeec55d90d401b461aeb5908bc5c7fb26d0ec96753befcd4f854821b6a93975f
-  data.tar.gz: 1e20d0e1721b12902184cd7e1b90f2dd5ed5d9cd46920f3a5232514c38b48e0e957d7f7b5b5aaab5811db4b3df2b932abc306ffabec5fd3959b5f202bf07ad5b
+  metadata.gz: 225b2d921edf71526a2b552dedfa5e5ace15cba32f4ab050d3ba5d4f22efe8fc156d597af1e92afabe63671f66357af9618e37f2a7d7ac5f29d515ee52469656
+  data.tar.gz: 75fbb8dd55a4effd2c99938bb76f6ad38ea4e687bc8461297146036cc9f4d2ef30d408260d963ab5fc175edd73e8e55e668c9c83c02a96a8a46ae70c9daf6607

data/Rakefile

@@ -4,7 +4,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/**/test_*.rb"]
 end
 
 task default: :test

data/discourse_theme.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "listen", "~> 3.1"
   spec.add_dependency "multipart-post", "~> 2.0"
   spec.add_dependency "tty-prompt", "~> 0.18"
+  spec.add_dependency "rubyzip", "~> 1.2"
 
   spec.required_ruby_version = '>= 2.2.0'
 end

data/lib/discourse_theme/client.rb

@@ -62,7 +62,8 @@ module DiscourseTheme
 
       response = request(Net::HTTP::Get.new endpoint)
       raise "Error downloading theme: #{response.code}" unless response.code.to_i == 200
-      response.body
+      raise "Error downloading theme: no content disposition" unless response["content-disposition"]
+      [response.body, response["content-disposition"].match(/filename=(\"?)(.+)\1/)[2]]
     end
 
     def update_theme(id, args)

data/lib/discourse_theme/downloader.rb

@@ -1,3 +1,5 @@
+require 'zip'
+
 class DiscourseTheme::Downloader
 
   def initialize(dir:, client:)
@@ -7,17 +9,27 @@ class DiscourseTheme::Downloader
   end
 
   def download_theme(id)
-    raw = @client.get_raw_theme_export(id)
-    sio = StringIO.new(raw)
-    gz = Zlib::GzipReader.new(sio)
-    Minitar.unpack(gz, @dir)
+    raw, filename = @client.get_raw_theme_export(id)
+
+    if filename.end_with?(".zip")
+      Zip::File.open_buffer(raw) do |zip_file|
+        zip_file.each do |entry|
+          new_path = File.join(@dir, entry.name)
+          entry.extract(new_path)
+        end
+      end
+    else
+      sio = StringIO.new(raw)
+      gz = Zlib::GzipReader.new(sio)
+      Minitar.unpack(gz, @dir)
 
-    # Minitar extracts into a sub directory, move all the files up one dir
-    Dir.chdir(@dir) do
-      folders = Dir.glob('*/')
-      raise "Extraction failed" unless folders.length == 1
-      FileUtils.mv(Dir.glob("#{folders[0]}*"), "./")
-      FileUtils.remove_dir(folders[0])
+      # Minitar extracts into a sub directory, move all the files up one dir
+      Dir.chdir(@dir) do
+        folders = Dir.glob('*/')
+        raise "Extraction failed" unless folders.length == 1
+        FileUtils.mv(Dir.glob("#{folders[0]}*"), "./")
+        FileUtils.remove_dir(folders[0])
+      end
     end
   end
 

data/lib/discourse_theme/version.rb

@@ -1,3 +1,3 @@
 module DiscourseTheme
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: CLI helper for creating Discourse themes
 email:
 - sam.saffron@gmail.com