github-pr 0.0.95 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b896148383896d20190818c44a116766866b731
-  data.tar.gz: 24f15690fcfcd263b201b998c4ff47202b9bd75e
+  metadata.gz: 5b50c962c46691c31b5697fe9026cde8721fe655
+  data.tar.gz: e24f063a34c1d4474060d1e67ac237857842b92a
 SHA512:
-  metadata.gz: 4a66c01839540b48badc1b4eeed4eb875cddff3ce081334c02ae1d2149eeecf4b6c11be257ed45ae34f7a4be8328c8b2d87dd30fc8e9a628b46aee2b1d18ffc0
-  data.tar.gz: c026d92355a9b204411c7f6862de02eea90e0208bf64494a72c210f679ddee43bb638e9c048008cc2732d5cc6f12e5f3750bed5e2ad83766bc5d80964f976a3f
+  metadata.gz: f97e1d0c4d56e0bc73496639b3e7d7de2ccf3b84dd2840c64a0f45bce1fd7679b75c42927b72c4dfa900c5cb8ea2412168e114181dbc94eeb94ff6dce7457224
+  data.tar.gz: 96d9d31fab7b2b37452893b1139163b7e9dedc4786f0585d60db4b06dad87ee0f0a8f04693ea3c5ab96b90804e0aaaa6a12b1f5ccd88c9469dcd8c0ee0ad0f00

data/lib/github-pr/poster.rb

@@ -11,14 +11,15 @@ module GitHubPr
 			begin
 				postPrivate(client, options)
 			rescue Octokit::Unauthorized
+				puts 'Unauthorized error, revoking access token'
 				client = Octokit::Client.new(:access_token => @token.get(regenerate: true))
 				postPrivate(client, options)
 			end
 		end
 		def postPrivate(client, options)
-			userAndReponame = cut_scheme_and_host(repo_url())
-			repo = userAndReponame.split(File::SEPARATOR).last
-			pull_request = client.create_pull_request(userAndReponame, 
+			repo_url = Poster.repo_url()
+			repo = cut_scheme_and_host(repo_url)
+			pull_request = client.create_pull_request(repo, 
 				options[:base],
 				options[:feature], 
 				options[:title], nil)
@@ -30,7 +31,7 @@ module GitHubPr
 	  def cut_scheme_and_host(url)
 	  	URI::parse(url).path[1..-1]
 	  end
-	  def repo_url
+	  def self.repo_url
 	  	`git config --get remote.origin.url`.chomp
 	  end
 	end

data/lib/github-pr/token.rb

@@ -15,6 +15,7 @@ module GitHubPr
 			elsif !direct_token.nil? && direct_token.length > 0
 				tokenObj = FixedToken.new(direct_token)
 			else
+				puts 'filetoken path:' + token_file_path
 				tokenObj = FileToken.new(token_file_path)
 			end
 			return tokenObj		
@@ -43,7 +44,7 @@ module GitHubPr
 		end
 
 		def token_from_file
-			File.exists? @token_file_path ? IO.read(@token_file_path) : nil
+			File.exist?(@token_file_path) ? IO.read(@token_file_path) : nil
 		end
 
 		def retry_logic(count, initial_note)
@@ -93,6 +94,7 @@ module GitHubPr
 			create_dir_if_needed()
 
 			if regenerate
+				puts 'Token has been reveked'
 				FileUtils.rm(@token_file_path)
 			end
 
@@ -100,6 +102,7 @@ module GitHubPr
 			if token
 				return token
 			end
+			puts 'Token is nil regenerating'
 
 			token = token_from_github()
       File.open(@token_file_path, 'w+') {|file| file.write token}

data/test/test_poster.rb

@@ -1,5 +1,6 @@
 require 'minitest/autorun'
 require 'github-pr/poster'
+require 'github-pr/token'
 
 module GitHubPr
 
@@ -9,18 +10,22 @@ module GitHubPr
       it "must return correct path" do
         poster = Poster.new("token")
         repo_url = "https://github.com/user/reponame"
-        userAndReponame = poster.cut_scheme_and_host(repo_url)
-        userAndReponame.must_equal "user/reponame"
+        repo = poster.cut_scheme_and_host(repo_url)
+        repo.must_equal "user/reponame"
       end
+    end
 
-      it "must return repo name" do
-        poster = Poster.new("token")
-        repo_url = "https://github.com/user/reponame"
-        userAndReponame = poster.cut_scheme_and_host(repo_url)
-        repo = userAndReponame.split(File::SEPARATOR).last
-        repo.must_equal "reponame"
-      end
-    end 
+    # describe "Pull requesting" do
+    #   it "must create git pull request" do
+    #     options = {:assign=>"hovox", :base=>"master", :feature=>"some-other-branch-bbb", :title=>"some-other-branch-bbb", :token=>nil}
+    #     Poster.stub(:repo_url, "https://github.com/PicsArt/picsart-ios") do
+    #       poster = Poster.new(Token.create(token_file_path:File.expand_path('~/.config/gh-pr-token'), direct_token: options[:token]))
+    #       puts 'repourl:' + Poster.repo_url
+		# 	    poster.post(options)
+    #     end
+        
+    #   end
+    # end 
 
   end
 

data/test/test_token.rb

@@ -17,6 +17,28 @@ module GitHubPr
       end
     end 
 
+    describe "File cache" do
+      it "must present after creation" do
+        path = File.expand_path '~/.config/gh-pr-token'
+        token = Token.create(token_file_path:path)
+        token.create_dir_if_needed()
+        token_dir = File.dirname(path)
+			  isDirExist = File.directory?(token_dir)
+        isDirExist.must_equal true
+      end
+
+      it "must return token from file if exists" do
+        some_token = '1aa277306fdadcfd64739a174fc4da09f8ddeea0'
+        path = File.expand_path '~/.config/gh-pr-token'
+        # puts 'cache path is:' + path
+
+        token = Token.create(token_file_path:path, direct_token:nil)
+        token.create_dir_if_needed()
+        token.token_from_file().must_equal some_token
+
+      end
+    end
+
     # describe "Token object creation" do
       
     # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-pr
 version: !ruby/object:Gem::Version
-  version: 0.0.95
+  version: 0.1.0
 platform: ruby
 authors:
 - Hovhannes Safaryan