abak-flow 0.3.1 → 0.3.2

data/.gitignore

@@ -2,5 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+tmp/
 .idea/
-.rvmrc
+.rvmrc
+.DS_Store

data/Gemfile

@@ -1,7 +1,3 @@
 source "https://rubygems.org"
 
-gemspec
-
-gem 'hub', '~> 1.8.4'
-gem 'commander', '~> 4.1.2'
-gem 'octokit', '~> 1.6.0'
+gemspec

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/abak-flow.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'hub', '~> 1.8.4'
+  s.add_runtime_dependency 'hub', '~> 1.10.3'
   s.add_runtime_dependency 'commander', '~> 4.1.2'
-  s.add_runtime_dependency 'octokit', '~> 1.6.0'
+  s.add_runtime_dependency 'octokit', '~> 1.19.0'
 end

data/lib/abak-flow/pull_request.rb

@@ -37,6 +37,14 @@ module Abak::Flow
         "#{upstream_project.owner}/#{upstream_project.name}"
       end
     end
+    alias_method :upstream_project, :from_repo
+    
+    def origin_project
+      @origin_project ||= begin
+        origin_project = repository.remote_by_name('origin').project
+        "#{origin_project.owner}/#{origin_project.name}"
+      end
+    end
     
     def origin_repo
       @origin_repo ||= repository.main_project.remote.name
@@ -207,5 +215,7 @@ module Abak::Flow
         [:origin, :upstream, :api_user, :api_token]
       end
     end
+    
+    class StrategyStatus < StrategyReadycheck; end
   end
 end

data/lib/abak-flow/request.rb

@@ -173,4 +173,62 @@ module Abak::Flow
       say color('Хм ... кажется у вас все готово к работе', :debug).to_s if request.valid?
     end
   end
+  
+  command :garbage do |c|
+    c.syntax      = 'git request status'
+    c.description = 'Проверить пригодность удаленных (origin) веток и возможность их уничтожения (ветки master, develop игнорируются)'
+
+    c.action do |args, options|
+      config  = Abak::Flow::Config.current
+      github_client = Abak::Flow::GithubClient.connect(config)
+      request = Abak::Flow::PullRequest.new(config, :strategy => :status)
+      
+      exit unless request.valid?
+      
+      messages = {unused: ["отсутствует в upstream репозитории", :notice],
+                  differ: ["отличается от origin репозитория", :warning],
+                  missing: ["отсутствует в локальном репозитории", :warning]}
+      
+      say "=> Обновляю данные о репозитории upstream"
+      %w(origin upstream).each { |remote| Hub::Runner.execute('fetch', remote, '-p') }
+      
+      say "=> Загружаю список веток для origin"
+      branches = github_client.branches(request.origin_project).
+                               reject { |branch| %w(master develop).include? branch.name }
+
+      say "=> На origin найдено веток: #{branches.count}\n\n"
+      branches.each_with_index do |branch, index|
+        index += 1
+
+        base = Abak::Flow::PullRequest.branch_by_prefix branch.name.split('/').first
+        
+        upstream_branch = %x(git branch -r --contain #{branch.commit.sha} | grep upstream/#{base} 2> /dev/null).strip
+        local_sha = %x(git show #{branch.name} --format=%H --no-notes 2> /dev/null | head -n 1).strip
+
+        statuses = {
+          unused: upstream_branch.empty?,
+          differ: !local_sha.empty? && local_sha != branch.commit.sha,
+          missing: local_sha.empty?
+        }
+        
+        unless statuses.values.inject &:|
+          say color("#{index}) #{branch.name} → можно удалить", :debug).to_s
+          say "\n"
+          next
+        end
+        
+        diagnoses = statuses.select { |_,bool| bool }.
+                             map { |name,_| messages[name].first }.
+                             map { |msg| "#{' ' * (index.to_s.length + 2)}   ↪ #{msg}" }.
+                             join("\n")
+
+        if statuses.select { |_,bool| bool }.keys == [:missing]
+          say color("#{index}) #{branch.name} → потенциально можно удалить", :warning).to_s
+          say "#{diagnoses}\n\n"
+        else
+          say "#{index}) #{branch.name}\n#{diagnoses}\n\n"
+        end
+      end
+    end
+  end
 end

data/lib/abak-flow/version.rb

@@ -1,5 +1,5 @@
 module Abak
   module Flow
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abak-flow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hub
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.10.3
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.19.0
 description: Простой набор правил и комманд, заточеных для работы в git-flow с использование
   в качестве удаленного репозитория github
 email: