From 72a30e302ed9d4788f455e37374f756286987989 Mon Sep 17 00:00:00 2001
From: Richard Brinkman <r.brinkman@gmail.com>
Date: Sun, 16 Jul 2017 16:20:04 +0200
Subject: [PATCH] FIX: incorrect order of defined methods in import/bitbucket
 script

---
 import/bitbucket/bitbucket2gitlab.rb | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/import/bitbucket/bitbucket2gitlab.rb b/import/bitbucket/bitbucket2gitlab.rb
index c968b47..dd63aad 100755
--- a/import/bitbucket/bitbucket2gitlab.rb
+++ b/import/bitbucket/bitbucket2gitlab.rb
@@ -10,6 +10,12 @@ require 'net/http'
 @host="host"
 @base_url="https://#{@host}/"
 
+def gitlab_key(email,password)
+  uri = URI("#{@base_url}/api/v3/session")
+  res = Net::HTTP.post_form(uri, 'email' => email, 'password' => password)
+  JSON.parse(res.body)['private_token']
+end
+
 ## Add your credentials here
 @token=gitlab_key('user','password')
 
@@ -28,12 +34,30 @@ require 'net/http'
 ## Kick off the import ##
 #########################
 
-import(load_bitbucket())
-
 def load_bitbucket()
   JSON.parse(IO.read('db-1.0.json'))
 end
 
+def post_issue(title,description)
+  uri = URI("#{@base_url}/api/v3/projects/#{@project}/issues")
+  res = Net::HTTP.post_form(uri, 'title' => title, 'description' => description, 'private_token' => @token, 'labels' => ['bitbucket2gitlab'])
+  created=JSON.parse(res.body)
+  puts created.to_json
+  created['id']
+end
+
+def close_issue(id)
+
+  # uri = URI("#{@base_url}/api/v3/projects/#{@project}/issues")
+
+  request = Net::HTTP::Put.new("/api/v3/projects/#{@project}/issues/#{id}")
+
+  request.set_form_data({'private_token' => @token,'state_event'=>'close'})
+  response=@http.request(request)
+  puts response.inspect
+  puts response.body
+end
+
 def import(bitbucket_json)
   id_map={}
   bitbucket_json['issues'].each do |issue|
@@ -52,19 +76,7 @@ def import(bitbucket_json)
 
 end
 
-def gitlab_key(email,password)
-  uri = URI("#{@base_url}/api/v3/session")
-  res = Net::HTTP.post_form(uri, 'email' => email, 'password' => password)
-  JSON.parse(res.body)['private_token']
-end
-
-def post_issue(title,description)
-  uri = URI("#{@base_url}/api/v3/projects/#{@project}/issues")
-  res = Net::HTTP.post_form(uri, 'title' => title, 'description' => description, 'private_token' => @token, 'labels' => ['bitbucket2gitlab'])
-  created=JSON.parse(res.body)
-  puts created.to_json
-  created['id']
-end
+import(load_bitbucket())
 
 def post_comment(id,content)
   uri = URI("#{@base_url}/api/v3/projects/#{@project}/issues/#{id}/notes")
@@ -73,18 +85,6 @@ def post_comment(id,content)
   puts created.to_json
 end
 
-def close_issue(id)
-
-  # uri = URI("#{@base_url}/api/v3/projects/#{@project}/issues")
-
-  request = Net::HTTP::Put.new("/api/v3/projects/#{@project}/issues/#{id}")
-
-  request.set_form_data({'private_token' => @token,'state_event'=>'close'})
-  response=@http.request(request)
-  puts response.inspect
-  puts response.body
-end
-
 def get_issues()
   request = Net::HTTP::Get.new("/api/v3/projects/#{@project}/issues?private_token=#{@token}")
   response=@http.request(request)