dod 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97cf06b562ec86180ce8328730c1045d88cffa92
-  data.tar.gz: bcef025e73123b0d1c62873d636355b236a44f0e
+  metadata.gz: 16787ca2162037f8a1545d1c409e21670d3c2424
+  data.tar.gz: a8214f700b6e9f8b5364445f1bcd193e6446c64b
 SHA512:
-  metadata.gz: 18c7771ea4aed1071a0f306cff91be9116bf001bd80b1c22782f0f3949df1c4137b285ac93379981967faf78653a588ac5ad5694ad453b3d60906b3aa693b16c
-  data.tar.gz: 2ca9fbdbb000bc8c1ef018f44dc4e8c29addc6e9e27af3517e6b03ead38a6dbd30dad336115f6b3870cd5399901d637742543a2e082520ab27226d0d434a94e6
+  metadata.gz: 53f7469a05b199594d00ebc9752860e7476c378e1cd8c4f4bd60f00d636a7b8d60e26559b53b68bc948d7edf8ecaa54072fed12415959dc730b4d6b7abda4fea
+  data.tar.gz: 9593165d2566963de8c3f44eeb17d7faca5ddc2bcb850ad200fc53ebdabe9ea217e601e5d56995b97e214912a7fc463582ddd9b5c14e0cf077811de8440b21f5

data/lib/dod.rb

@@ -1,7 +1,7 @@
 require "dod/version"
 require "dod/commands/runner"
 require "dod/dod_core/donefile"
-require "dod/helpers/git_helper"
+require "dod/helpers/repository"
 require "dod/client/bitbucket_server_api"
 
 module Dod

data/lib/dod/client/bitbucket_server_api.rb

@@ -5,8 +5,8 @@ module Dod
     attr_accessor :endpoint, :pull_request_id
 
     def initialize(environment, project, repo, branch)
-      @username = environment["BITBUCKET_USERNAME"]
-      @password = environment["BITBUCKET_PASSWORD"]
+      @username = environment["bamboo_BITBUCKET_USERNAME"]
+      @password = environment["bamboo_BITBUCKET_PASSWORD"]
 
       self.endpoint = "https://stash.allegrogroup.com/rest/api/1.0/projects/#{project}/repos/#{repo}"
       self.pull_request_id = get_pull_request_id(branch)

data/lib/dod/commands/runner.rb

@@ -11,7 +11,7 @@ module Dod
     def initialize(argv)
       donefile = argv.option("donefile", "Donefile")
       @donefile_path = donefile if File.exist?(donefile)
-      @git = GitHelper.new
+      @repository = Repository.new
       @donefile = Donefile.new
       super
     end
@@ -21,9 +21,6 @@ module Dod
       if self.class == Runner && !@donefile_path
         help!("Could not find a Donefile.")
       end
-      if not File.directory?(".git") 
-        help!("Not a git repository.")
-      end
     end
 
     def self.options
@@ -34,7 +31,14 @@ module Dod
 
     def run
       tasks = @donefile.parse_tasks(@donefile_path)
-      bitbucket = BitbucketServerAPI.new(ENV, @git.project_name, @git.repo_name, @git.current_branch)
+      project_name = @repository.project_name(ENV)
+      repo_name = @repository.repo_name(ENV)
+      current_branch = environment["bamboo_repository_git_branch"]
+      unless project_name && repo_name && current_branch
+        puts "Lack of definition of one of the environment variable (bamboo_repository_git_branch, bamboo_planRepository_repositoryUrl or bamboo_planRepository_repositoryUrl).".red
+        return
+      end
+      bitbucket = BitbucketServerAPI.new(ENV, project_name, repo_name, current_branch)
       bitbucket.create_definition_of_done(tasks)
     end
   end

data/lib/dod/helpers/repository.rb

@@ -0,0 +1,16 @@
+module Dod
+  class Repository
+
+    def repo_name(environment)
+      repo_url = environment["bamboo_planRepository_repositoryUrl"]
+      url_components = URI.parse(repo_url)
+      url_components.path.split('/')[2].split('.').first
+    end
+
+    def project_name(environment)
+      repo_url = environment["bamboo_planRepository_repositoryUrl"]
+      url_components = URI.parse(repo_url)
+      url_components.path.split('/')[1].upcase
+    end
+  end
+end

data/lib/dod/version.rb

@@ -1,3 +1,3 @@
 module Dod
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dod
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aleksander Grzyb
@@ -93,7 +93,7 @@ files:
 - lib/dod/client/bitbucket_server_api.rb
 - lib/dod/commands/runner.rb
 - lib/dod/dod_core/donefile.rb
-- lib/dod/helpers/git_helper.rb
+- lib/dod/helpers/repository.rb
 - lib/dod/version.rb
 homepage: 
 licenses:

data/lib/dod/helpers/git_helper.rb

@@ -1,26 +0,0 @@
-require 'git'
-
-module Dod
-  class GitHelper
-
-    attr_accessor :g
-
-    def initialize
-      @g = Git.open(".")
-    end
-
-    def current_branch 
-      g.current_branch
-    end
-
-    def repo_name
-      url_components = URI.parse(g.remote('origin').url)
-      url_components.path.split('/')[3].split('.').first
-    end
-
-    def project_name
-      url_components = URI.parse(g.remote('origin').url)
-      url_components.path.split('/')[2].upcase
-    end
-  end
-end