vimgolf 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 54dea0f839cd9e4b251b1b3d9f1b8d1be31fb0dc
-  data.tar.gz: 0e96fa1acc4894b104702e6492748742ea42204c
+SHA256:
+  metadata.gz: 0b23232451856233bb686ed2dc5936c491ca41a8c467b4e950f55a2d23f70064
+  data.tar.gz: 268b52ce2fd8286b75d1c974659d960178db0bd9a532cb65c541105d38d49328
 SHA512:
-  metadata.gz: 2d413648da95e0c81b4f0668841605732e8265d373f56c5a98afd771d304ed547b19d8f2551e4cd007bbed2ab77d0607c2b81eedb90d22735c6159eb74b46e12
-  data.tar.gz: bf03e208e358a3522d4c0fb6e3fcbb301a44b6202f3f9b9900c1d3a8e78820558ea7783b5ee208d180f5b22c0cfd79a687ed462ff372846158ab87cf84f20714
+  metadata.gz: 79484a6f2863cf654efa511bf8fee8dc4e771c445c43007c6bd1a6c80d1fcfedc601d8af59457e2ad0ef6bafbaa59955f168fa78af92da49715b5e67953e6729
+  data.tar.gz: 327f122659a3af5ba371a140a55544adef6612862eace4b71bc8da4b392587f4730613b68ac31edeffa0192eaa50d05ce0f7b2aab48a2b72b9d6626b137acca6

data/lib/vimgolf/challenge.rb

@@ -38,12 +38,14 @@ module VimGolf
     def download
       @remote = true
       begin
-        url = URI.parse("#{GOLFHOST}/challenges/#{@id}.json")
-        req = Net::HTTP::Get.new(url.path)
-
-        proxy_url, proxy_user, proxy_pass = get_proxy
-        proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
-        res = proxy.start(url.host, url.port) { |http| http.request(req) }
+        url = URI("#{GOLFHOST}/challenges/#{@id}.json")
+        res = Net::HTTP.start(
+          url.hostname,
+          url.port,
+          use_ssl: url.scheme == 'https'
+        ) do |http|
+          http.request_get(url)
+        end
 
         @data = JSON.parse(res.body)
 
@@ -84,23 +86,27 @@ module VimGolf
 
     def upload
       begin
-        url = URI.parse("#{GOLFHOST}/entry.json")
-
-        proxy_url, proxy_user, proxy_pass = get_proxy
-        proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
-
-        proxy.start(url.host, url.port) do |http|
-          request = Net::HTTP::Post.new(url.request_uri)
-          request.set_form_data({"challenge_id" => @id, "apikey" => Config.load['key'], "entry" => IO.binread(log_path)})
-          request["Accept"] = "application/json"
-
-          res = http.request(request)
-          res = JSON.parse(res.body)
+        url = URI("#{GOLFHOST}/entry.json")
+        res = Net::HTTP.start(
+          url.hostname,
+          url.port,
+          use_ssl: url.scheme == 'https'
+        ) do |http|
+          http.request_post(
+            url,
+            URI.encode_www_form(
+              "challenge_id" => @id,
+              "apikey" => Config.load['key'],
+              "entry" => IO.binread(log_path)
+            ),
+            "Accept" => "application/json"
+          )
+        end
 
-          raise if !res.is_a? Hash
-          res['status'].to_sym
+        res = JSON.parse(res.body)
 
-        end
+        raise if !res.is_a? Hash
+        res['status'].to_sym
       rescue Exception => e
         debug(e)
         raise "Uh oh, entry upload has failed, please check your key."
@@ -122,20 +128,6 @@ module VimGolf
     end
 
     private
-      def get_proxy
-        begin
-          proxy_url = URI.parse(PROXY)
-        rescue Exception => e
-          VimGolf.ui.error "Invalid proxy uri in http_proxy environment variable - will try to run with out proxy"
-          proxy_url = URI.parse("");
-        end
-
-        proxy_url.port ||= 80
-        proxy_user, proxy_pass = proxy_url.userinfo.split(/:/) if proxy_url.userinfo
-
-        return proxy_url, proxy_user, proxy_pass
-      end
-
       def debug(msg)
         p [caller.first, msg] if GOLFDEBUG
       end

data/lib/vimgolf/cli.rb

@@ -1,10 +1,9 @@
 module VimGolf
 
   GOLFDEBUG    = ENV['GOLFDEBUG'].to_sym rescue false
-  GOLFHOST     = ENV['GOLFHOST']     || "http://www.vimgolf.com"
+  GOLFHOST     = ENV['GOLFHOST']     || "https://www.vimgolf.com"
   GOLFSHOWDIFF = ENV['GOLFSHOWDIFF'] || 'vim -d -n'
   GOLFVIM      = ENV['GOLFVIM']      || 'vim'
-  PROXY        = ENV['http_proxy']   || ''
 
   class Error
   end
@@ -26,9 +25,22 @@ module VimGolf
   class CLI < Thor
     include Thor::Actions
 
-    def self.start(*)
+    def self.initialize_ui
+      return if @ui_initialized
       Thor::Base.shell = VimGolf::CLI::UI
       VimGolf.ui = VimGolf::CLI::UI.new
+      @ui_initialized = true
+    end
+
+    def self.reset_ui
+      return unless @ui_initialized
+      Thor::Base.shell = Thor::Shell::Color
+      VimGolf.ui = nil
+      @ui_initialized = false
+    end
+
+    def self.start(*)
+      initialize_ui
       super
     end
 

data/lib/vimgolf/version.rb

@@ -1,3 +1,3 @@
 module Vimgolf
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimgolf
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,22 +74,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.1
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.9
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: Real Vim ninjas count every keystroke - do you? Pick a challenge on vimgolf.com,
   fire up Vim, and show us what you got.
 email:
@@ -136,7 +178,7 @@ metadata: {}
 post_install_message: |2
 
   ------------------------------------------------------------------------------
-  Thank you for installing vimgolf-0.4.9.
+  Thank you for installing vimgolf-0.5.0.
 
   0.1.3: custom vimgolf .vimrc file to help level the playing field
   0.2.0: proxy support, custom diffs + proper vimscript parser/scoring
@@ -154,15 +196,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: vimgolf
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: CLI client for vimgolf.com