learn-config 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c222608abd203ce1ed652817f6ffbc534634c53
-  data.tar.gz: 10aba38a717371ce7ac06a98b35706aa8635c45e
+  metadata.gz: ad486c6bd9a01d483e66bb6282b292e2cb0a239d
+  data.tar.gz: 3d35aaaff9d4346fd402014720b26c3fa2d4a649
 SHA512:
-  metadata.gz: 4e9fcd0b7a31a44a4ffc2a681f9e38a2e75444e07b7054b8ddcfe542faeb81054c6d174f87355034fc22bec3a9ae859809faf336753e0511226b051f61ffb4a5
-  data.tar.gz: a553829f22ecebcc82281f4c033c3eb5384b1663e49bac0e2a1d409fa81f9f4d8716b51df9143f287471611e98e23befc527e2fdda19608cc41ff0246ff76d6b
+  metadata.gz: 80a961f07aae047d824fb4efd97b216a0ab6b9d0812162934b816eb26398aa3f8b499fd15acbdf70a365110ca783302cafaa08ad465e5ea3d66e8a6671a827e3
+  data.tar.gz: 4102baeedfd6c607a79bbfb866d7bf50d876609208bb69434edf3b98e4009a6e232905e98930d0e0a4633469fb3a4cf47a87fe3356e45d53eb270bfb5f62dc55

data/learn-config.gemspec

@@ -21,6 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency "netrc"
-  spec.add_runtime_dependency "faraday", "~> 0.9"
-  spec.add_runtime_dependency "oj", "~> 2.9"
+  spec.add_runtime_dependency "learn-web"
 end

data/lib/learn_config/cli.rb

@@ -40,7 +40,7 @@ page at: https://learn.co/#{github_username ? github_username : 'your-github-use
     end
 
     def token_valid?
-      learn = LearnConfig::LearnWebInteractor.new(token, silent_output: true)
+      learn = LearnWeb::Client.new(token: token, silent_output: true)
       learn.valid_token?
     end
   end

data/lib/learn_config/setup.rb

@@ -1,6 +1,3 @@
-require 'faraday'
-require 'oj'
-
 module LearnConfig
   class Setup
     attr_reader   :netrc, :args, :reset, :whoami
@@ -32,7 +29,7 @@ module LearnConfig
 
     def whoami?
       _learn, token = netrc.read
-      me = LearnConfig::LearnWebInteractor.new(token).me
+      me = LearnWeb::Client.new(token: token).me
       puts "Name:     #{me.full_name}"
       puts "Username: #{me.username}"
       puts "Email:    #{me.email}"
@@ -68,7 +65,7 @@ module LearnConfig
     def setup_learn_config_machine
       login, password = netrc.read
 
-      if (!login || !password) || !LearnConfig::LearnWebInteractor.new(password, silent_output: true).valid_token?
+      if (!login || !password) || !LearnWeb::Client.new(token: password, silent_output: true).valid_token?
         github_username, _uid = netrc.read(machine: 'flatiron-push')
         oauth_token = LearnConfig::CLI.new(github_username).ask_for_oauth_token
         netrc.write(new_login: 'learn', new_password: oauth_token)
@@ -78,7 +75,7 @@ module LearnConfig
     def setup_flatiron_push_config_machine
       learn_login, token  = netrc.read(machine: 'learn-config')
 
-      if (!learn_login || !token) || !LearnConfig::LearnWebInteractor.new(token, silent_output: true).valid_token?
+      if (!learn_login || !token) || !LearnWeb::Client.new(token: token, silent_output: true).valid_token?
         setup_learn_config_machine
       else
         ensure_correct_push_config(token)
@@ -86,7 +83,7 @@ module LearnConfig
     end
 
     def ensure_correct_push_config(token)
-      me              = LearnConfig::LearnWebInteractor.new(token).me
+      me              = LearnWeb::Client.new(token: token).me
       github_username = me.username
       github_user_id  = me.github_uid
 

data/lib/learn_config/version.rb

@@ -1,3 +1,3 @@
 module LearnConfig
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/learn_config.rb

@@ -4,6 +4,7 @@ require 'learn_config/netrc_interactor'
 require 'learn_config/learn_web_interactor'
 require 'learn_config/me'
 require 'learn_config/cli'
+require 'learn-web'
 
 module LearnConfig
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-config
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: learn-web
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '0'
 description: 
 email:
 - learn@flatironschool.com
@@ -97,8 +83,6 @@ files:
 - learn-config.gemspec
 - lib/learn_config.rb
 - lib/learn_config/cli.rb
-- lib/learn_config/learn_web_interactor.rb
-- lib/learn_config/me.rb
 - lib/learn_config/netrc_interactor.rb
 - lib/learn_config/setup.rb
 - lib/learn_config/version.rb

data/lib/learn_config/learn_web_interactor.rb

@@ -1,35 +0,0 @@
-require 'faraday'
-
-module LearnConfig
-  class LearnWebInteractor
-    attr_reader :token, :conn, :silent_output
-
-    LEARN_URL = 'https://learn.co'
-    API_ROOT  = '/api/v1'
-
-    def initialize(token, silent_output: false)
-      @token = token
-      @silent_output = silent_output
-      @conn = Faraday.new(url: LEARN_URL) do |faraday|
-        faraday.adapter Faraday.default_adapter
-      end
-    end
-
-    def me_endpoint
-      "#{API_ROOT}/users/me"
-    end
-
-    def me
-      response = @conn.get do |req|
-        req.url me_endpoint
-        req.headers['Authorization'] = "Bearer #{token}"
-      end
-
-      LearnConfig::Me.new(response, silent_output: silent_output)
-    end
-
-    def valid_token?
-      !!me.data
-    end
-  end
-end

data/lib/learn_config/me.rb

@@ -1,52 +0,0 @@
-require 'oj'
-
-module LearnConfig
-  class Me
-    attr_accessor :response, :id, :first_name, :last_name, :full_name,
-                  :username, :email, :github_gravatar, :github_uid, :data,
-                  :silent_output
-
-    def initialize(response, silent_output: false)
-      @response      = response
-      @silent_output = silent_output
-
-      parse!
-    end
-
-    def parse!
-      if response.status == 200
-        self.data = Oj.load(response.body, symbol_keys: true)
-
-        populate_attributes!
-      elsif silent_output == false
-        case response.status
-        when 401
-          puts "It seems your OAuth token is incorrect. Please re-run config with: learn reset"
-          exit
-        when 500
-          puts "Something went wrong. Please try again."
-          exit
-        else
-          puts "Something went wrong. Please try again."
-          exit
-        end
-      end
-
-      self
-    end
-
-    private
-
-    def populate_attributes!
-      data.each do |attribute, value|
-        if !self.respond_to?(attribute)
-          class << self
-            attr_accessor attribute
-          end
-        end
-
-        self.send("#{attribute}=", value)
-      end
-    end
-  end
-end