atlassian-stash 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f81d9c053732742249900feca5fddb74f3a461
-  data.tar.gz: 27493f645b3d5bf6e773b6764fb0c9770c9c8339
+  metadata.gz: f108029674203b07feb43c788c21b500f2a681d6
+  data.tar.gz: 969ff0cb30cf6bb55fa6f137714aaf7b7ea8db50
 SHA512:
-  metadata.gz: 295a94d7eccbf34b67c98fb480c5d2a6c865728e7318b8f369d05baee1084614c4fe7d3e15cdf418370d95d1834bfe23928852bd4bb1459ee4117cbb7327a61e
-  data.tar.gz: 66bb5e44dd120ddaee257622a3f319aea8c75886ac306bd0ba60ae881ae007ed5bbba531c72390a2e4d9d06d0f1da7f944175d2b68069ebca4e120a5f2fc42ac
+  metadata.gz: 283e3979a42e790293548dc7a5e5f0164c16e185dd7361b2853e7dd1a5b6b2e2114484f0817ebb39db3a930f90c771553e73c71d4735b5674eaa336c831e3cd8
+  data.tar.gz: db3063ea5662fbd4d1a9ad9ae065130d9e65aff823bf66e58a4b6087d9f7239cceee67a7268f4a290cf8915dcf163337a6b1bf7681247f604d6c705d3a776e6c

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/stash

@@ -14,21 +14,26 @@ program :description, "Provides convenient functions for interacting with Atlass
 include Atlassian::Stash
 include Atlassian::Stash::Git
 
-$configFile = File.join(ENV['HOME'], ".stashconfig.yml")
+$configFileName = ".stashconfig.yml"
+$configFile = File.join(ENV['HOME'], $configFileName)
 
 def load_config
   raise "No Stash configuration found; please run configure" unless File.exists? $configFile
   config = YAML.load_file($configFile)
   raise "Stash configuration file is incomplete, please re-run configure" unless config['username'] and config['stash_url']
-  config.merge! repo_config
+  config.merge! repo_config if repo_config
   config
 end
 
 def repo_config
   return @repo_config if @repo_config
-  ascender = Pathname.pwd.to_enum(:ascend)
-  config_path = ascender.detect { |path| (path + '.stash').exist? }
-  @repo_config = YAML.load_file(path + '.stash')
+
+  repo_root = get_repo_root_directory.strip
+  repo_directory = Pathname.new(repo_root)
+  stash_config = repo_directory + $configFileName
+  if (stash_config.exist? && stash_config.file?)
+    @repo_config = YAML.load_file(stash_config)
+  end
   @repo_config
 end
 
@@ -66,7 +71,7 @@ end
 
 command 'pull-request' do |c|
   def extract_reviewers(args = [])
-    default_reviewers = Array(repo_config[:reviewers])
+    default_reviewers = repo_config.nil? ? [] : Array(repo_config[:reviewers])
     default_reviewers.concat args.collect { |user|
       user[1..-1] if user.start_with?("@")
     }.compact
@@ -90,7 +95,7 @@ command 'pull-request' do |c|
     source = args.shift
     if args.empty? or args.first.start_with?("@")
       target = source
-      source = get_current_branch()
+      source = get_current_branch
       reviewers = extract_reviewers args
     else
       target = args.shift

data/lib/atlassian/stash/git.rb

@@ -31,6 +31,10 @@ module Atlassian
       def create_git_alias
         %x(git config --global alias.create-pull-request "\!sh -c 'stash pull-request \\$0'")
       end
+
+      def get_repo_root_directory
+        %x(git rev-parse --show-toplevel)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atlassian-stash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Seb Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git