hexlet 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83667856922d7be718c50a433c1030b80ff01e79
-  data.tar.gz: 07f72445f54353ae7c2008ba58afa021d7f00b62
+  metadata.gz: 3274ee106665e58461c5b533f9ae4a56b10d5932
+  data.tar.gz: 1dc4d25ce21eda12f198441647c1be0f6c68b023
 SHA512:
-  metadata.gz: ed2365506f02afce46085b90d5e2fba665c0a39ecfec0cf5eaa2d46dd8052b30042debd22d2861b7d9d6909ea3b3ce007ac0884c49ebf791424c0268b4f1d648
-  data.tar.gz: 3946bb29c3b6841ec063b7edc3518645cd74d7e8c85594464ebee4c3e8eeb53c64e8d26e5ea8561d24c855083bf764822a7669f9994557f10d8cba091d4f708e
+  metadata.gz: 425b0568413f0f1fabb08c265fcc06d923ce0451925283287128dce65ba1270bfc5342032ab3590d5001294decc90bba6502290c1a2e91a7f94f54e69d0ddbc4
+  data.tar.gz: bc6d4c1dd24a556e692880e8c89c67095ee3a493c3abfa1c610667674dc0240627df4147bfabff63791f735eca69d760438f0dc461434ca2cfc4042640de9431

data/lib/hexlet/base_cli.rb

@@ -11,7 +11,7 @@ module Hexlet
 
     desc "login HEXLET_API_KEY", "login on hexlet.io"
     def login(key)
-      client = BaseClient.new key, logger: logger
+      client = build_client(key)
       if client.login
         puts (t :ok)
         write_config("hexlet_api_key" => key)

data/lib/hexlet/member_cli.rb

@@ -18,6 +18,7 @@ module Hexlet
       # process.start
       _, e, s = Open3.capture3("make test -C #{path}")
       if s == 0
+        client = build_client
         result = client.submit lesson_slug, exercise_folder_name
         if result
           puts (t :created)
@@ -36,6 +37,7 @@ module Hexlet
     desc "fetch LESSON_SLUG EXERCISE_SLUG", "download lesson exercise"
     def fetch(lesson_slug, exercise_slug)
       # FIXME check login
+      client = build_client
       if content = client.fetch(lesson_slug, exercise_slug)
         lesson_path = File.join("/", "vagrant", "exercises", "#{lesson_slug}_lesson")
         exercise_path = File.join(lesson_path, exercise_slug)
@@ -67,8 +69,8 @@ module Hexlet
 
     private
 
-    def client
-      @client ||= Hexlet::MemberClient.new config["hexlet_api_key"], logger: logger, host: options["host"]
+    def build_client(key = config["hexlet_api_key"])
+      Hexlet::MemberClient.new options[:key], logger: logger, host: options["host"]
     end
   end
 end

data/lib/hexlet/teacher_cli.rb

@@ -26,6 +26,7 @@ module Hexlet
 
       filepath = generate_lesson_tarball(expanded_path)
 
+      client = build_client
       result = client.submit slug, filepath
 
       if result
@@ -68,8 +69,8 @@ module Hexlet
       exercise_tarball_path
     end
 
-    def client
-      @client ||= Hexlet::TeacherClient.new config["hexlet_api_key"], logger: logger, host: options["host"]
+    def build_client(key = config["hexlet_api_key"])
+      Hexlet::TeacherClient.new key, logger: logger, host: options["host"]
     end
   end
 end

data/lib/hexlet/version.rb

@@ -1,3 +1,3 @@
 module Hexlet
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/locales/en.membercli.yml

@@ -1,13 +1,13 @@
 en:
   membercli:
     submit:
-      created: exercise result has been sent
-      wrong_lesson_folder: wrong folder, please submit the exercise folder
+      created: Exercise submitted
+      wrong_lesson_folder: Wrong folder, please submit the exercise folder
     fetch:
-      ok: exercise has been downloaded
-      not_found: lesson or exercise not found
+      ok: Exercise downloaded
+      not_found: Lesson or exercise not found
       ask:
-        replace_exercise: Exercise already exists. Would you like replace one?
+        replace_exercise: Exercise already exists. Would you like overwrite it?
     login:
-      ok: login has been succesfull
-      not_found: User has not been found
+      ok: Logged in
+      not_found: User not found

data/locales/en.teachercli.yml

@@ -4,5 +4,5 @@ en:
       lesson_folder_created: create '%{folder}'
     submit:
       error: "Can't submit lesson"
-      created: lesson has been uploaded
+      created: Lesson submitted
       wrong_lesson_folder: Wrong lesson folder

data/locales/en.yml

@@ -1,2 +1,2 @@
 en:
-  update_config: Config has been updated
+  update_config: Configuration updated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexlet
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kirill Mokevnin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler