discourse_theme 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39560cfe4f927edff0919dc9c325d0288982107
-  data.tar.gz: ad749d7d12462e0eb5b217a1bab3ad19e0398e72
+  metadata.gz: e2c86731ccd3d670e5e80b81bd8667692d6b08e6
+  data.tar.gz: 03f1878d96b8bfffc682193346101393e70e5b3f
 SHA512:
-  metadata.gz: 9c4cc9c5149385f35616b8f0f6aade9320b1eb2fdb0c77fb3d8dcc4fe457301ee9a7082d3e90b28ecc553cc3b07fa74c67729780946ad0de76ede02474b2a48e
-  data.tar.gz: 538a23533f1e9eebaad4a1decd9e388bfd782c4d0c38e49072eaf98d18b8392c82c93511bf18a206de904c18d44e43fcd937ff877af65b53acc2723c8fd9e367
+  metadata.gz: f52f41636624d5cce942f16d94a5b2b45d40d4f9aaa1d52a81dc3b0d662ddb24c7bf087125def21e32d20ea31484e57b8ec9a3348c8ba1aad6492371feb6e34e
+  data.tar.gz: 8e193ff8da06e4f9ca6d05ae3de3f1d746c2a7d3286c41e0f7028c4c90f56de1948802167da62a10f800df47c9dedfc776900de7b39ac1bf68750714ede6f9f7

data/.rubocop.yml

@@ -0,0 +1,110 @@
+AllCops:
+  TargetRubyVersion: 2.2
+  DisabledByDefault: true
+  Exclude:
+    - 'bundle/**/*'
+    - 'pkg/**/*'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/Debugger:
+  Enabled: true
+
+Layout/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/AlignHash:
+  Enabled: true
+
+Bundler/OrderedGems:
+  Enabled: false

data/Guardfile

@@ -0,0 +1,9 @@
+directories %w(app lib test) \
+  .select { |d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist") }
+
+guard :minitest do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/discourse_theme.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "guard", "~> 2.14"
+  spec.add_development_dependency "guard-minitest", "~> 2.4"
 
-  spec.add_dependency "minitar", "~> 0.5"
+  spec.add_dependency "minitar", "~> 0.6"
   spec.add_dependency "listen", "~> 3.1"
   spec.add_dependency "multipart-post", "~> 2.0"
 

data/lib/discourse_theme.rb

@@ -10,8 +10,10 @@ require 'net/http/post/multipart'
 require 'uri'
 require 'listen'
 require 'json'
+require 'yaml'
 
 require 'discourse_theme/version'
+require 'discourse_theme/config'
 require 'discourse_theme/cli'
 require 'discourse_theme/uploader'
 require 'discourse_theme/watcher'

data/lib/discourse_theme/cli.rb

@@ -1,71 +1,62 @@
 class DiscourseTheme::Cli
 
-  WATCHER_SETTINGS_FILE = File.expand_path("~/.discourse-theme-watcher")
+  SETTINGS_FILE = File.expand_path("~/.discourse_theme")
 
   def usage
-    puts "Usage: discourse-theme COMMAND"
+    puts "Usage: discourse_theme COMMAND"
     puts
-    puts "discourse-theme new DIR : Creates a new theme in the designated directory"
-    puts "discourse-theme watch DIR : Watches the theme directory and synchronizes with Discourse"
+    puts "discourse_theme new DIR : Creates a new theme in the designated directory"
+    puts "discourse_theme watch DIR : Watches the theme directory and synchronizes with Discourse"
     exit 1
   end
 
-  def guess_api_key
+  def guess_api_key(settings)
     api_key = ENV['DISCOURSE_API_KEY']
     if api_key
       puts "Using api_key provided by DISCOURSE_API_KEY"
     end
 
-    if !api_key && File.exist?(WATCHER_SETTINGS_FILE)
-      api_key = File.read(WATCHER_SETTINGS_FILE).strip
-      puts "Using previously stored api key in #{WATCHER_SETTINGS_FILE}"
+    if !api_key && settings.api_key
+      api_key = settings.api_key
+      puts "Using previously stored api key in #{SETTINGS_FILE}"
     end
 
     if !api_key
       puts "No API key found in DISCOURSE_API_KEY env var enter your API key: "
       api_key = STDIN.gets.strip
-      puts "Would you like me to store this API key in #{WATCHER_SETTINGS_FILE}? (Yes|No)"
+      puts "Would you like me to store this API key in #{SETTINGS_FILE}? (Yes|No)"
       answer = STDIN.gets.strip
       if answer =~ /y(es)?/i
-        File.write WATCHER_SETTINGS_FILE, api_key
+        settings.api_key = api_key
       end
     end
 
     api_key
   end
 
-  def guess_site(dir)
-    site = ENV['DISCOURSE_SITE']
-    if site
-      puts "Site provided by DISCOURSE_SITE"
+  def guess_url(settings)
+    url = ENV['DISCOURSE_URL']
+    if url
+      puts "Site provided by DISCOURSE_URL"
     end
 
-    site_conf = dir + "/.discourse-site"
-
-    if !site && File.exist?(site_conf)
-      site = File.read(site_conf).strip
-      puts "Using #{site} defined in #{site_conf}"
+    if !url && settings.url
+      url = settings.url
+      puts "Using #{url} defined in #{SETTINGS_FILE}"
     end
 
-    if !site
-      puts "No site found, where would you like to synchronize the theme to: "
-      site = STDIN.gets.strip
-      puts "Would you like me to store this site name at: #{site_conf}? (Yes|No)"
+    if !url
+      puts "No site found! Where would you like to synchronize the theme to: "
+      url = STDIN.gets.strip
+      url += "http://" unless url =~ /^https?:\/\//
+      puts "Would you like me to store this site name at: #{SETTINGS_FILE}? (Yes|No)"
       answer = STDIN.gets.strip
       if answer =~ /y(es)?/i
-        File.write site_conf, site
-        # got to make sure this is in .gitignore
-
-        gitignore = File.read(dir + "/.gitignore") rescue ""
-        if gitignore !~ /^.discourse-site/
-          gitignore.strip!
-          gitignore += "\n.discourse-site"
-          File.write(dir + '/.gitignore', gitignore)
-        end
+        settings.url = url
       end
     end
 
-    site
+    url
   end
 
   def run
@@ -85,11 +76,14 @@ class DiscourseTheme::Cli
         usage
       end
 
-      api_key = guess_api_key
-      site = guess_site(dir)
+      config = DiscourseTheme::Config.new(SETTINGS_FILE)
+      settings = config[dir]
+
+      url = guess_url(settings)
+      api_key = guess_api_key(settings)
 
-      if !site
-        puts "Missing site!"
+      if !url
+        puts "Missing site to synchronize with!"
         usage
       end
 
@@ -98,8 +92,8 @@ class DiscourseTheme::Cli
         usage
       end
 
-      uploader = DiscourseTheme::Uploader.new(dir: dir, api_key: api_key, site: site)
-      print "Uploading theme from #{dir} to #{site} : "
+      uploader = DiscourseTheme::Uploader.new(dir: dir, api_key: api_key, site: url)
+      print "Uploading theme from #{dir} to #{url} : "
       uploader.upload_full_theme
 
       watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)

data/lib/discourse_theme/config.rb

@@ -0,0 +1,76 @@
+class DiscourseTheme::Config
+
+  class PathSetting
+    def initialize(config, path)
+      @config = config
+      @path = path
+    end
+
+    def api_key
+      safe_config["api_key"]
+    end
+
+    def api_key=(val)
+      set("api_key", val)
+    end
+
+    def url
+      safe_config["url"]
+    end
+
+    def url=(val)
+      set("url", val)
+    end
+
+    protected
+
+    def set(name, val)
+      hash = @config.raw_config[@path] ||= {}
+      hash[name] = val
+      @config.save
+      val
+    end
+
+    def safe_config
+      config = @config.raw_config[@path]
+      if Hash === config
+        config
+      else
+        {}
+      end
+    end
+  end
+
+  attr_reader :raw_config, :filename
+
+  def initialize(filename)
+    @filename = filename
+
+    if File.exist?(@filename)
+      begin
+        @raw_config = YAML.load_file(@filename)
+        raise unless Hash === @raw_config
+      rescue
+        @raw_config = {}
+        $stderr.puts "ERROR: #{@filename} contains invalid config, resetting"
+      end
+    else
+      @raw_config = {}
+    end
+  end
+
+  def set(path, url:, api_key:)
+    @raw_config[path] = {
+      "url" => url,
+      "api_key" => api_key
+    }
+  end
+
+  def save
+    File.write(@filename, @raw_config.to_yaml)
+  end
+
+  def [](path)
+    PathSetting.new(self, path)
+  end
+end

data/lib/discourse_theme/uploader.rb

@@ -40,7 +40,6 @@ class DiscourseTheme::Uploader
     count
   end
 
-
   def upload_theme_field(target: , name: , type_id: , value:)
 
     raise "expecting theme_id to be set!" unless @theme_id
@@ -59,6 +58,8 @@ class DiscourseTheme::Uploader
     uri = URI.parse(@site + "/admin/themes/#{@theme_id}?api_key=#{@api_key}")
 
     http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = URI::HTTPS === uri
+
     request = Net::HTTP::Put.new(uri.request_uri, 'Content-Type' => 'application/json')
     request.body = args.to_json
 
@@ -82,6 +83,7 @@ class DiscourseTheme::Uploader
     # new full upload endpoint
     uri = URI.parse(@site + "/admin/themes/import.json?api_key=#{@api_key}")
     http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = URI::HTTPS === uri
     File.open(filename) do |tgz|
 
       request = Net::HTTP::Post::Multipart.new(
@@ -97,12 +99,12 @@ class DiscourseTheme::Uploader
         end
       else
         puts "Error importing theme status: #{response.code}"
+
+        puts response.body
       end
     end
 
   ensure
     FileUtils.rm_f filename
   end
-
-
 end

data/lib/discourse_theme/version.rb

@@ -1,3 +1,3 @@
 module DiscourseTheme
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -103,9 +131,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -113,6 +143,7 @@ files:
 - discourse_theme.gemspec
 - lib/discourse_theme.rb
 - lib/discourse_theme/cli.rb
+- lib/discourse_theme/config.rb
 - lib/discourse_theme/scaffold.rb
 - lib/discourse_theme/uploader.rb
 - lib/discourse_theme/version.rb