scrumship-client 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593c0086c8c866117eb2db3586b29e5b215954a116ca9088dcf7a259eda147bd
-  data.tar.gz: 3c15452b285504bac9af84acf4f87bb5cf59ac26ff67622e1cf18dc2088518bb
+  metadata.gz: e90d90da1b4c725e50d3bf12307b0aa7b61d7c2ac02d25a5b1ccafca5ff2e197
+  data.tar.gz: 83933ef49300f2a949a1305706771cf09db1b22d43d7e4154f5c317effd37b58
 SHA512:
-  metadata.gz: 30a4b9f9582687f67b5ceafbe4e0d9fd61ad5531c9bb47f5ae629f415feca9f7f05d49150d4d7ce39e0ec23e9a012ea6c804ad4b7326fbcf0633a9d64f21b933
-  data.tar.gz: 9641df33c38a520b5ee3de31359089d6798261657d6fa2d52210a95f5f215869bd153231ca5213f317dfd97cb1e67b225ba7978dd100d2695a0f797711cf3dc0
+  metadata.gz: 710d9dd747086f611c19b6df3fdcfa55a5bb48de28d557250993174787d3fc9732663efb1b101493d0a8b8cde2184987aefe4460dc1e483b539378fd67f0143e
+  data.tar.gz: f20f7ae601cad09f3b2d9eb650ce83acd1e85ef3321d19bd2082a8f20b7a96eef8523aaf01b7012c1c818ab96d4aeb9ce9f096d0b3f7f5a408a6ee1e0e900e0c

data/lib/scrumship/client/version.rb

@@ -1,5 +1,3 @@
 module Scrumship
-  module Client
-    VERSION = "1.0.13"
-  end
+  VERSION = "1.0.14"
 end

data/lib/scrumship/client.rb

@@ -3,63 +3,50 @@ require 'net/http'
 require 'json'
 
 module Scrumship
-  class Configuration
-    attr_accessor :config_file
-    attr_accessor :activity_log_url
-    attr_accessor :project_token
-    attr_accessor :activity_token
-
-    def initialize
-      @activity_log_url = 'https://app.scrumship.com/api/ac'
-      @config_file = 'scrumship.json'
-    end
-  end
 
   module Client
 
-    def self.configure
-      yield(configuration)
-      ScrumshipClient::Client.setup
-      if Rails.configuration.cache_classes
-        ScrumshipClient::Client.log
+    def self.log(activity_token, config_file = 'scrumship.json')
+      if defined?(Rails) && Rails.configuration.cache_classes
+        Scrumship::Client.do_log(activity_token, config_file)
       else
         if defined?(ActiveSupport::Reloader)
           ActiveSupport::Reloader.to_prepare do
-            ScrumshipClient::Client.log
+            Scrumship::Client.do_log(activity_token, config_file)
           end
         elsif defined?(ActionDispatch::Reloader)
           ActionDispatch::Reloader.to_prepare do
-            ScrumshipClient::Client.log
+            Scrumship::Client.do_log(activity_token, config_file)
           end
         end
       end
     end
 
-    def self.setup(configuration = Configuration.new)
+    def self.setup(project_token, activity_log_url = 'https://app.scrumship.com/api/ac', config_file = 'scrumship.json')
       begin
-        username = `git config user.name`
-        username = username.gsub('\n', '').strip!
-        url = "#{configuration.activity_log_url}/e/#{configuration.project_token}"
+        username = git_command('git config user.name').gsub('\n', '').strip!
+        email = git_command('git config user.email').gsub('\n', '').strip!
+        url = "#{activity_log_url}/e/#{project_token}"
         http = client(url)
         uri = URI.parse(url)
         req = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
-        req.body = { username: username }.to_json
+        req.body = { username: username, email: email }.to_json
         res = http.request(req)
 
         json_res = JSON.parse(res.body)
         if json_res["status"] == 200
-          config = { u: json_res["token"], url: configuration.activity_log_url, pt: configuration.project_token }
-          File.open(configuration.config_file, 'w') { |file| file.write(config.to_json) }
+          config = { u: json_res["token"], url: activity_log_url, pt: project_token }
+          File.open(config_file, 'w') { |file| file.write(config.to_json) }
         end
       rescue
         # Ignored
       end
     end
 
-    def self.log
+    def self.do_log(activity_token, config_file)
       begin
-        token = JSON.parse(File.read(configuration.config_file)).symbolize_keys[:u]
-        url = "#{configuration.activity_log_url}/#{configuration.project_token}/#{configuration.activity_token}/#{token}"
+        config = JSON.parse(File.read(config_file)).symbolize_keys
+        url = "#{config[:activity_log_url]}/#{config[:pt]}/#{activity_token}/#{config[:u]}"
         http = client(url)
         http.get(url)
       rescue
@@ -75,5 +62,20 @@ module Scrumship
       http
     end
 
+    def self.git_command(command)
+      begin
+        result = `#{command}`
+        if result == ""
+          raise Exception
+        end
+        result
+      rescue
+        puts "Please set up your git user and git user email: " +
+               "\n git config --global user.name \"Your Username\"" +
+               "\n git config --global user.email \"email@example.com\""
+        exit 1
+      end
+    end
+
   end
 end

data/scrumship-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'scrumship-client'
-  s.version = '1.0.13'
+  s.version = '1.0.14'
   s.date = '2021-12-04'
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrumship-client
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Greg Dymek