lib/abak-flow/branch.rb in abak-flow-1.0.10 vs lib/abak-flow/branch.rb in abak-flow-1.1.0

@@ -18,13 +18,12 @@
 
     attr_reader :folder
     attr_reader :task
 
     def initialize(branch)
-      @manager = Manager.instance
       @branch = branch.is_a?(Git::Branch) ? branch
-                                          : @manager.git.branch(branch)
+                                          : Manager.git.branch(branch)
 
       parse_branch_name
     end
 
     def name
@@ -41,15 +40,15 @@
     def to_s
       @branch.to_s
     end
 
     def compare_link(branch)
-      diff = "#{@manager.repository.upstream.owner}:#{branch}...#{@branch}"
+      diff = "#{Manager.repository.upstream.owner}:#{branch}...#{@branch}"
 
       File.join [
-        @manager.github.web_endpoint,
-        @manager.repository.origin.to_s,
+        Manager.github.web_endpoint,
+        Manager.repository.origin.to_s,
         "compare", diff
       ]
     end
 
     def extract_base_name(options = Hash.new)
@@ -70,17 +69,17 @@
       [tasks_from_commit_message, task].flatten.compact.uniq
         .map { |x| "http://jira.railsc.ru/browse/#{x}" } * "\n"
     end
 
     def update
-      origin = @manager.repository.origin.repo
-      @manager.git.push(origin, @branch)
+      origin = Manager.repository.origin.repo
+      Manager.git.push(origin, @branch)
     end
 
     def delete_on_remote
-      origin = @manager.repository.origin.repo
-      @manager.git.push(origin, ":#{@branch}")
+      origin = Manager.repository.origin.repo
+      Manager.git.push(origin, ":#{@branch}")
     end
 
     def delete_on_local
       @branch.delete
     end
@@ -112,10 +111,10 @@
     def current?
       @branch.current
     end
 
     def valid?
-      !@branch.name.empty?
+      !@branch.name.strip.empty?
     end
 
     private
     def tasks_from_commit_message
       @parsed_tasks ||=