learn-config 0.0.32 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6136a968684df0874fd1233d310236ecef7a71f7
-  data.tar.gz: 962d7fc423fca0d5c815197f2d3adbee3c0c2271
+  metadata.gz: cb03acc57001c37cbe478f0643a06dd3dfaa382a
+  data.tar.gz: d2c7e51ab9b44078230c00dc6b6d824b47be9ca7
 SHA512:
-  metadata.gz: 18a389430d3ee342378cf2d396e4979901dc7329316267cdc3c1de375eb7165854552cc7f3a9f370c64925a37657e1891d8d9d53213ade3d9b3f958672e3d675
-  data.tar.gz: 60aec616c42eaebea70d96e24486a7a4e0b4283d6f97d1b731f9fdedd5956657c0fd7dc92993328037895a21699619dbff7b50b3ecbcad0dd04b87b4367d04e1
+  metadata.gz: a4466289fdd1415b918f20646745589e5cd36b8f9fa3bb3bcdf1335faabfd6fd81b06d2cb4ccaefed4d242346f6e45776664b63293a1dfe70e6df4973334bbb8
+  data.tar.gz: 73c820c29bd1a684bf6c119f29e93e17d75f8e761684035a857cc22ea34abd6bd54c5fb8c1217d943377f5d9168baa64bed1b0d5bcaba1a23749ac4da6648d80

data/bin/learn-config

@@ -4,7 +4,8 @@ require 'learn_config'
 
 KNOWN_COMMANDS = [
   '--reset',
-  '--whoami'
+  '--whoami',
+  '--set-directory'
 ]
 
 ARGV.map! do |arg|

data/learn-config.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency "netrc"
-  spec.add_runtime_dependency "learn-web"
+  spec.add_runtime_dependency "learn-web", ">= 1.0.0"
 end

data/lib/learn_config/cli.rb

@@ -11,7 +11,7 @@ module LearnConfig
       if !short_text
         puts <<-LONG
 To connect with the Learn web application, you will need to configure
-the Learn gem with an OAuth token. You can find yours on your profile
+the Learn gem with an OAuth token. You can find yours at the bottom of your profile
 page at: https://learn.co/#{github_username ? github_username : 'your-github-username'}.
 
         LONG
@@ -39,9 +39,21 @@ page at: https://learn.co/#{github_username ? github_username : 'your-github-use
       end
     end
 
-    def token_valid?
+    def token_valid?(retries=3)
       learn = LearnWeb::Client.new(token: token, silent_output: true)
-      learn.valid_token?
+      begin
+        Timeout::timeout(15) do
+          learn.valid_token?
+        end
+      rescue Timeout::Error
+        if retries > 0
+          puts "There was an error validating your token. Retrying..."
+          token_valid?(retries-1)
+        else
+          puts "There was a problem connecting to Learn. Please try again."
+          exit
+        end
+      end
     end
   end
 end

data/lib/learn_config/setup.rb

@@ -1,16 +1,17 @@
 module LearnConfig
   class Setup
-    attr_reader   :netrc, :args, :reset, :whoami
+    attr_reader   :netrc, :args, :reset, :whoami, :set_dir
 
     def self.run(args)
       new(args).run
     end
 
     def initialize(args)
-      @args   = args
-      @netrc  = LearnConfig::NetrcInteractor.new
-      @reset  = !!args.include?('--reset')
-      @whoami = !!args.include?('--whoami')
+      @args    = args
+      @netrc   = LearnConfig::NetrcInteractor.new
+      @reset   = !!args.include?('--reset')
+      @whoami  = !!args.include?('--whoami')
+      @set_dir = !!args.include?('--set-directory')
     end
 
     def run
@@ -19,24 +20,101 @@ module LearnConfig
         confirm_and_reset!
       elsif whoami
         args.delete('--whoami')
+        check_config
         whoami?
+      elsif set_dir
+        args.delete('--set-directory')
+        check_config
+        set_directory!
       else
-        setup_netrc
+        check_config
       end
     end
 
     private
 
-    def whoami?
+    def check_config
+      setup_netrc
+      setup_learn_directory
+      setup_editor
+    end
+
+    def whoami?(retries=3)
       _learn, token = netrc.read
-      me = LearnWeb::Client.new(token: token).me
-      puts "Name:     #{me.full_name}"
-      puts "Username: #{me.username}"
-      puts "Email:    #{me.email}"
+      begin
+        me = Timeout::timeout(15) do
+          LearnWeb::Client.new(token: token).me
+        end
+      rescue Timeout::Error
+        if retries > 0
+          puts "There was an error connecting to Learn. Retrying..."
+          whoami?(retries-1)
+        else
+          puts "Could not connect to Learn. Please try again."
+          exit
+        end
+      end
+      puts "Name:      #{me.full_name}"
+      puts "Username:  #{me.username}"
+      puts "Email:     #{me.email}"
+      puts "Learn Dir: #{learn_directory}"
 
       exit
     end
 
+    def learn_directory
+      config_data = File.read(File.expand_path('~/.learn-config'))
+      YAML.load(config_data)[:learn_directory]
+    end
+
+    def set_directory!
+      path = ''
+
+      while !path.start_with?('/')
+        print "Enter the directory in which to store Learn lessons (/Users/#{ENV['USER']}/Development/code): "
+        path = gets.chomp
+
+        if path.start_with?('~')
+          path = File.expand_path(path)
+        elsif path == ''
+          path = "/Users/#{ENV['USER']}/Development/code"
+        elsif !path.start_with?('/')
+          puts "Absolute paths only, please!"
+        end
+      end
+
+      write_new_directory_data!(path)
+    end
+
+    def write_new_directory_data!(path)
+      create_dir = true
+
+      if !new_directory_exists?(path)
+        print "#{path} doesn't exist. Create it? [Yn]: "
+        response = gets.chomp.downcase
+
+        if !['yes', 'y', ''].include?(response)
+          create_dir = false
+        end
+      end
+
+      if create_dir
+        FileUtils.mkdir_p(path)
+
+        config_path = File.expand_path('~/.learn-config')
+        existing_editor = YAML.load(File.read(config_path))[:editor]
+        data = YAML.dump({ learn_directory: path, editor: existing_editor })
+
+        File.write(config_path, data)
+      else
+        set_directory!
+      end
+    end
+
+    def new_directory_exists?(path)
+      File.exists?(path)
+    end
+
     def confirm_and_reset!
       if confirm_reset?
         netrc.delete!(machine: 'learn-config')
@@ -62,6 +140,63 @@ module LearnConfig
       setup_flatiron_push_config_machine
     end
 
+    def setup_learn_directory
+      if !config_file?
+        write_default_config!
+      end
+    end
+
+    def setup_editor
+      if !config_file?
+        write_defalt_config!
+      end
+    end
+
+    def config_file?
+      path = File.expand_path('~/.learn-config')
+      File.exists?(path) && has_yaml?(path)
+    end
+
+    def has_yaml?(file_path)
+      !!YAML.load(File.read(file_path)) && valid_config_yaml?(file_path)
+    end
+
+    def valid_config_yaml?(path)
+      yaml       = YAML.load(File.read(path))
+      dir        = !!yaml[:learn_directory]
+      dir_path   = yaml[:learn_directory]
+      dir_exists = dir && File.exists?(dir_path)
+      editor     = !!yaml[:editor]
+
+      if !dir_exists
+        puts "It seems like your Learn directory isn't quite right. Let's fix that."
+        set_directory!
+        dir_exists = true
+      end
+
+      dir && dir_exists && editor
+    end
+
+    def write_default_config!
+      learn_dir = File.expand_path('~/Development/code')
+      config_path = File.expand_path('~/.learn-config')
+
+      ensure_default_dir_exists!(learn_dir)
+      ensure_config_file_exists!(config_path)
+
+      data = YAML.dump({ learn_directory: learn_dir, editor: "subl" })
+
+      File.write(config_path, data)
+    end
+
+    def ensure_default_dir_exists!(learn_dir)
+      FileUtils.mkdir_p(learn_dir)
+    end
+
+    def ensure_config_file_exists!(config_path)
+      FileUtils.touch(config_path)
+    end
+
     def setup_learn_config_machine
       login, password = netrc.read
 

data/lib/learn_config/version.rb

@@ -1,3 +1,3 @@
 module LearnConfig
-  VERSION = "0.0.32"
+  VERSION = "1.0.0"
 end

data/lib/learn_config.rb

@@ -1,3 +1,7 @@
+require 'yaml'
+require 'fileutils'
+require 'timeout'
+
 require 'learn_config/version'
 require 'learn_config/setup'
 require 'learn_config/netrc_interactor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-config
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 1.0.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 description: 
 email:
 - learn@flatironschool.com