conflux 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f67875c84e257fe44a6ed4174eb7634184f3b4b
-  data.tar.gz: b856d38da6d97155b9e86b8e31117240c1b1307f
+  metadata.gz: 4533ef01b7d5dc2cc743aaa716445df8de04c613
+  data.tar.gz: ce5771a9a3bf263fb77218b04f77d82331b63e5b
 SHA512:
-  metadata.gz: 020df88471311d0569fa8b04532dc1bc1e313c9464f0f082172eca02bedfacd77f3cad015f43544a53a6776d17706cf790ec3c6980fb667a7bcdc3aa664ea206
-  data.tar.gz: 77e632c1244039970938c13504316975c86f891c4b6cf86b6380338482821d2fb961aad4b07176765147b010ed8f7102770c1aa24a5d4bd8d178f924d2ac964d
+  metadata.gz: a60d89dcf5de27b4f7d806a5e72dd32e8e163b02ff7d29280305d27f5bb02b2e856710f049c0cc745b047a553e8d8312951a18c68c442b5b2edc653af96c1910
+  data.tar.gz: 8c97aa0bf79dbce7a395daf30a05400bb4659692d3b0f492dec62a8e24accf36cee6fa765a1b5a42c0114dbb8be9625c21d0c6e4dc196eb06a3693288b08b0a1

data/conflux.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rest-client", "1.6.8"
-
   spec.add_development_dependency "rails", "~> 4.0"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/conflux/helpers.rb

@@ -1,3 +1,8 @@
+require 'net/http'
+require 'net/https'
+require 'uri'
+require 'json'
+
 module Conflux
   module Helpers
     extend self
@@ -80,14 +85,6 @@ module Conflux
       RUBY_PLATFORM =~ /mswin32|mingw32/
     end
 
-    def url(route)
-      "#{host_url}/api#{route}"
-    end
-
-    def host_url
-      ENV['CONFLUX_HOST'] || 'http://api.goconflux.com'
-    end
-
     def prompt_user_to_select_app(apps_map)
       answer = nil
       question = "\nWhich Conflux app does this project belong to?\n"
@@ -134,8 +131,43 @@ module Conflux
       exit(1)
     end
 
+    def host_url
+      ENV['CONFLUX_HOST'] || 'http://api.goconflux.com'
+    end
+
+    def http
+      uri = URI.parse(host_url)
+      Net::HTTP.new(uri.host, uri.port)
+    end
+
+    def form_request(net_obj, route, data, headers, error_message)
+      data ||= {}
+      headers ||= {}
+      route = data.empty? ? route : "#{route}?#{URI.encode_www_form(data)}"
+      request = net_obj.new("/api#{route}")
+      request.add_field('Content-Type', 'application/x-www-form-urlencoded')
+      add_headers(request, headers)
+      response = http.request(request)
+      handle_json_response(response, error_message)
+    end
+
+    def json_request(net_obj, route, data, headers, error_message)
+      data ||= {}
+      headers ||= {}
+      request = net_obj.new("/api#{route}")
+      request.add_field('Content-Type', 'application/json')
+      add_headers(request, headers)
+      request.body = data.to_json
+      response = http.request(request)
+      handle_json_response(response, error_message)
+    end
+
+    def add_headers(request, headers)
+      headers.each { |key, val| request.add_field(key, val) }
+    end
+
     def handle_json_response(response, error_message)
-      if response.code == 200
+      if response.code.to_i == 200
         JSON.parse(response.body) rescue {}
       else
         error(error_message)

data/lib/conflux/version.rb

@@ -1,3 +1,3 @@
 module Conflux
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/conflux.rb

@@ -1,17 +1,15 @@
 require 'conflux/version'
-require 'rest-client'
+require 'conflux/helpers'
 require 'json'
 
 module Conflux
   require 'conflux/railtie' if defined?(Rails)
   extend self
 
-  config_vars_path = File.join(Dir.pwd, 'configs.yml')
-
-  if File.exists?(config_vars_path)
+  if File.exists?('../configs.yml')
     require 'yaml'
-    configs = YAML::load_file(config_vars_path) rescue {}
-    configs.each { |key, val|
+    configs = YAML::load_file('../configs.yml') rescue {}
+    (configs || {}).each { |key, val|
       ENV[key] = val if !ENV.key?(key)
     }
   end
@@ -54,12 +52,8 @@ module Conflux
   end
 
   def fetch_configs
-    RestClient.get("#{conflux_url}/api/keys", headers) do |response|
-      if response.code == 200
-        configs = JSON.parse(response.body) rescue []
-        set_configs(configs, !@creds_preset)
-      end
-    end
+    configs = Conflux::Helpers.form_request(Net::HTTP::Get, '/keys', {}, headers, 'Error fetching Conflux configs')
+    set_configs(configs, !@creds_preset)
   end
 
   def set_configs(configs_map, add_to_yml)

data/lib/tasks/conflux.rake

@@ -10,31 +10,39 @@ namespace :conflux do
     helpers = Conflux::Helpers
     creds = helpers.ask_for_basic_creds
 
-    RestClient.post(helpers.url('/users/apps_basic_auth'), creds) do |response|
-      body = helpers.handle_json_response(response, 'Authentication failed.')
-
-      # Ask which app user wants to use:
-      app_slug = helpers.prompt_user_to_select_app(body['apps_map'])
-
-      RestClient.get(helpers.url("/apps/manifest?app_slug=#{app_slug}"), { 'Conflux-User' => body['token'] }) do |response|
-        resp = helpers.handle_json_response(response, 'Request failed.')
-        manifest_json = resp['manifest']
-
-        # Create .conflux/ folder if doesn't already exist
-        FileUtils.mkdir_p(helpers.conflux_folder_path) if !File.exists?(helpers.conflux_folder_path)
-
-        puts 'Configuring manifest.json...'
-
-        # Write this app info to a new manifest.json file for the user
-        File.open(helpers.conflux_manifest_path, 'w+') do |f|
-          f.write(JSON.pretty_generate(manifest_json))
-        end
-
-        puts "Successfully connected project to conflux app: #{app_slug}"
-        puts "The 'conflux' ruby gem wasn't automatically installed...Make sure it's installed if you haven't already done so."
-      end
+    auth_response_body = helpers.json_request(
+      Net::HTTP::Post,
+      '/users/apps_basic_auth',
+      creds,
+      nil,
+      'Authentication failed.'
+    )
+
+    # Ask which app the user wants to use:
+    app_slug = helpers.prompt_user_to_select_app(auth_response_body['apps_map'])
+
+    manifest_response_body = helpers.form_request(
+      Net::HTTP::Get,
+      '/apps/manifest',
+      { app_slug: app_slug },
+      { 'Conflux-User' => auth_response_body['token'] },
+      'Connecting to Conflux app failed.'
+    )
+
+    manifest_json = manifest_response_body['manifest']
+
+    # Create .conflux/ folder if doesn't already exist
+    FileUtils.mkdir_p(helpers.conflux_folder_path) if !File.exists?(helpers.conflux_folder_path)
+
+    puts 'Configuring manifest.json...'
+
+    # Write this app info to a new manifest.json file for the user
+    File.open(helpers.conflux_manifest_path, 'w+') do |f|
+      f.write(JSON.pretty_generate(manifest_json))
     end
 
+    puts "Successfully connected project to conflux app: #{app_slug}"
+    puts "The 'conflux' ruby gem wasn't automatically installed...Make sure it's installed if it's not already."
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conflux
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ben Whittle
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement