newline_hw 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28e442adebc87b5de1d6baf8f7ebf3e1a5daf53
-  data.tar.gz: 417115780717dac70f57b29dbfd538803b722164
+  metadata.gz: d46ce94918c8dc2f9531f7c099083d157572e3e6
+  data.tar.gz: 606c4c9232451b006937bbd1db6f74ead21750f4
 SHA512:
-  metadata.gz: '018456c7304830fbecb8a768b40523c87a36941c04fdbcbb5ece218bcbdcda429863f93c33e7b4c9456dfd08d52733bc25e17ff490113bbe083edf35067c24b9'
-  data.tar.gz: 0d3a8e7e97b468b9ae42f8c880c12e16df03f724682e67f1b2b0f71dc79513bcc47e87031722ae2431c5b622a9c948b4614666a12f4ce3ad5a71bde7a306fcdc
+  metadata.gz: 20fe34238d130e1cda2c2971fb3c7f28ce71d20f98d68b40555232b6bed0331b410b7adc0ac0737cea126f05ace629e5afb41fc7f19138d8a116b2985c210824
+  data.tar.gz: 502d10233ddc89a0ed940d3cfd32e4a6046e00b944d3094199b55b9f58028526ac0e21d8527f27c8aad888825f7c6a3b84f16386698e78d309d6e84b2a8203e0

data/README.md

@@ -83,10 +83,9 @@ _Javascript_
 
 ## TIYO-Assistant Integration
 
-This provides a message bus to allow TIYO assistant to send json to our local binary. This is used to open a terminal window (Apple Terminal or iTerm2) using appleScript and start a `$ hw <submission-id>` command.  We use the NewlineCli to backfill data required to run the remainder of the commands.
+This provides a message bus to allow TIYO assistant to send json to our local binary. This is used to open a terminal window (Apple Terminal or iTerm2) using appleScript and start a `$ hw <submission-id>` command.  We use the Newline Api to backfill data required to run the remainder of the commands.
 
 1. You MUST be on a MAC (hope to drop this in the future)
-1. You MUST have `newline_cli` installed
 2. You MUST be running a ruby 2.3 or higher
 3. You MUST have that ruby either in the system loadpath or use, rbenv, rvm, or chruby.
 4. THIS IS ALPHA so please send logs.

data/lib/newline_hw.rb

@@ -7,11 +7,10 @@ require_relative "newline_hw/chrome_manifest"
 require_relative "newline_hw/gui_trigger"
 require_relative "newline_hw/stream_command_handler"
 require_relative "newline_hw/stream_processor"
-require "newline_cli"
-require "newline_cli/api"
-require "newline_cli/token"
-require "newline_cli/error"
-require "newline_cli/auth"
+require_relative "newline_hw/api"
+require_relative "newline_hw/token"
+require_relative "newline_hw/errors"
+
 require "active_support/core_ext/string"
 
 module NewlineHw

data/lib/newline_hw/api.rb

@@ -0,0 +1,55 @@
+require "json"
+require "excon"
+require "netrc"
+
+module NewlineHw
+
+  class Api
+    DEFAULT_HOST = "https://newline.theironyard.com"
+
+    attr_reader :host
+
+    def initialize
+      @host = Api.host
+      token = NewlineHw::Token.get_for_user
+      @connection = Excon.new(@host, headers: {
+        "Authorization" => "token #{token}"
+      })
+    end
+
+    def post(path, data)
+      response = @connection.post(path: "/api/#{path}", body: data.to_json, headers: {
+        "Accept"       => "application/json",
+        "Content-Type" => "application/json"
+      }, expects: [200, 201])
+      JSON.parse(response.body)
+    end
+
+    def put(path, data)
+      response = @connection.put(path: "/api/#{path}", body: data.to_json, headers: {
+        "Accept"       => "application/json",
+        "Content-Type" => "application/json"
+      }, expects: [200, 201])
+      JSON.parse(response.body)
+    end
+
+    def get(path)
+      response = @connection.get(path: "/api/#{path}", expects: 200)
+      JSON.parse(response.body)
+    end
+
+    def self.auth(data)
+      response = Excon.post("#{host}/api/auth", headers: {
+        "Content-Type" => "application/json"
+      }, body: data)
+      raise NewlineHw::AuthenticationError, "Invalid email or password" if response.status != 200
+      JSON.parse(response.body)
+    end
+
+  private
+
+    def self.host
+      ENV["NEWLINE_API_HOST"] || DEFAULT_HOST
+    end
+  end
+end

data/lib/newline_hw/cli.rb

@@ -66,7 +66,7 @@ module NewlineHw
     option :editor
     def setup_command(submission_id)
       puts Shell::Setup.new(submission_id, config).cmd
-    rescue NewlineCli::AuthenticationError => e
+    rescue NewlineHw::AuthenticationError => e
       say "Could not log into Newline using NewlineCLI, have you logged in?"
       say "Error from NewlineCli #{e.message}"
       exit 3

data/lib/newline_hw/errors.rb

@@ -0,0 +1,4 @@
+module NewlineHw
+  class AuthenticationError < StandardError
+  end
+end

data/lib/newline_hw/gui_trigger.rb

@@ -2,7 +2,6 @@ require "uri"
 require "net/http"
 require "json"
 require "openssl"
-require "newline_cli/api"
 
 module NewlineHw
   class GuiTrigger

data/lib/newline_hw/shell/setup.rb

@@ -110,7 +110,7 @@ module NewlineHw
       end
 
       private def query_submission_info
-        NewlineCli::Api.new.get("assignment_submissions/#{@newline_submission_id}")
+        NewlineHw::Api.new.get("assignment_submissions/#{@newline_submission_id}")
       end
     end
   end

data/lib/newline_hw/stream_command_handler.rb

@@ -35,7 +35,6 @@ module NewlineHw
         message_at: message_at,
         data: {
           newline_hw_version: NewlineHw::VERSION,
-          newline_cli_version: NewlineCli::VERSION,
           ruby_version: RUBY_VERSION,
           newline_hw_config_path: Config::CONFIG_PATH,
           newline_hw_path: NewlineHw.root_path,

data/lib/newline_hw/token.rb

@@ -0,0 +1,33 @@
+require "jwt"
+require "yaml"
+
+module NewlineHw
+  class Token
+    NETRC_KEY = "newline.theironyard.com"
+
+    def self.decode(token)
+      payload = JWT.decode(token, nil, false)
+      payload[0]
+    end
+
+    def self.get_for_path
+      path_config = YAML.load_file(".path.config")
+      path_config["token"]
+    end
+
+    def self.get_for_user
+      return ENV["NEWLINE_API_TOKEN"] if ENV["NEWLINE_API_TOKEN"]
+      if (netrc = netrc_file[NETRC_KEY])
+        netrc["password"]
+      else
+        raise NewlineHw::AuthenticationError, "No stored credentials or ENV[\"NEWLINE_API_TOKEN\"]"
+      end
+    end
+
+  private
+
+    def self.netrc_file
+      Netrc.read("#{Netrc.home_path}/#{Netrc.netrc_filename}")
+    end
+  end
+end

data/lib/newline_hw/version.rb

@@ -1,3 +1,3 @@
 module NewlineHw
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
 end

data/newline_hw.gemspec

@@ -30,7 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 5.0"
   spec.add_dependency "json", ">= 2.0.0"
   spec.add_dependency "thor", "~> 0.19.1"
-  spec.add_dependency "newline_cli", ">= 0.2.5"
+  spec.add_dependency "excon", ">= 0.46.0"
+  spec.add_dependency "netrc", "~> 0.11.0"
+  spec.add_dependency "jwt", ">= 1.5.6"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newline_hw
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Russell Osborne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,19 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: newline_cli
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.46.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.46.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,9 +175,11 @@ files:
 - exe/newline_hw_stream
 - exe/newline_hw_stream_shim
 - lib/newline_hw.rb
+- lib/newline_hw/api.rb
 - lib/newline_hw/chrome_manifest.rb
 - lib/newline_hw/cli.rb
 - lib/newline_hw/config.rb
+- lib/newline_hw/errors.rb
 - lib/newline_hw/gui_trigger.rb
 - lib/newline_hw/shell/function.rb
 - lib/newline_hw/shell/run.rb
@@ -159,6 +189,7 @@ files:
 - lib/newline_hw/shell/setup.rb
 - lib/newline_hw/stream_command_handler.rb
 - lib/newline_hw/stream_processor.rb
+- lib/newline_hw/token.rb
 - lib/newline_hw/version.rb
 - newline_hw.gemspec
 homepage: https://online.theironyard.com.