stash_cli 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8c1066129b0faf86a427e81d3350db5e41c95d
-  data.tar.gz: 35f494b920588f3bd0956f89cbeae7a9dd3016a0
+  metadata.gz: 85972d5793f307d24064947ea8bb06d761f3454b
+  data.tar.gz: a4f27190b20c818a5444179c4ad96797c93fff96
 SHA512:
-  metadata.gz: 2f7a11fdb2ad5e1af04b85bdf51706c2d84c342c30c2560378f958bab529663fb96f92cd8057e026915e9ecdb077d4d6319cc775f322fa873394308927f64940
-  data.tar.gz: b2704403d36f246e0c918ac5a74aa6b31df073fed4df38409114fadef9f4d232482f639360c675dc0aee91e4a756e69ca27cc5226b3cb429b62a749a3220b314
+  metadata.gz: bbb32178046b6588656ccd6b93d072f1c382eebf7720aed4caffa144290a7adb38374a3078803bb75e23808cb3f1bb9d29900eb5ff49ed94c152a9c61b81ca21
+  data.tar.gz: a598cf00ec8de8851c0584d43fe3a558d4daf28411d3e9baa0538ff46848232833680e94cb9550a65160ae32593b489af1e5b2e17e957e4012910ea02947beed

data/lib/stash_cli/cli.rb

@@ -5,11 +5,14 @@ require 'base64'
 
 require 'stash_cli/client'
 require 'stash_cli/git_utils'
+require 'stash_cli/project'
 
 module StashCLI
   class CLI < Thor
     include Thor::Actions
 
+    attr_reader :project
+
     def self.source_root
       File.dirname(__FILE__)
     end
@@ -65,7 +68,7 @@ module StashCLI
     def branches
       configure
       client = Client.new(configatron.server, configatron.auth_token)
-      resp = client.branches(configatron.defaults.project, configatron.defaults.source_slug)
+      resp = client.branches(project.project, project.source_slug)
       resp['values'].each do |value|
         say value['displayId']
       end
@@ -237,16 +240,16 @@ module StashCLI
     def default_pr(title)
       reviewers = initial_reviewers
 
-      target_branch = configatron.defaults.target_branch
+      target_branch = project.target_branch
       target_branch = options[:branch] if options[:branch]
 
       opts = {
         title: title,
-        project: configatron.defaults.project,
+        project: project.project,
         from_branch: GitUtils.current_branch,
-        from_slug: configatron.defaults.source_slug,
+        from_slug: project.source_slug,
         target_branch: target_branch,
-        target_slug: configatron.defaults.target_slug,
+        target_slug: project.target_slug,
         reviewers: reviewers
       }
 
@@ -260,11 +263,11 @@ module StashCLI
     def interactive_pr(title)
 
       target_branch =
-        ask("target branch [#{configatron.defaults.target_branch}]:").strip
+        ask("target branch [#{project.target_branch}]:").strip
 
       description = get_description(target_branch)
 
-      target_branch = configatron.defaults.target_branch if target_branch.empty?
+      target_branch = project.target_branch if target_branch.empty?
 
       reviewers = initial_reviewers
 
@@ -281,11 +284,11 @@ module StashCLI
 
       opts = {
         title: title,
-        project: configatron.defaults.project,
+        project: project.project,
         from_branch: GitUtils.current_branch,
-        from_slug: configatron.defaults.source_slug,
+        from_slug: project.source_slug,
         target_branch: target_branch,
-        target_slug: configatron.defaults.target_slug,
+        target_slug: project.target_slug,
         reviewers: reviewers
       }
 
@@ -303,6 +306,39 @@ module StashCLI
         say 'generate a basic config with "stash init"'
         exit 1
       end
+
+      repo_dir = GitUtils.repo_dir
+      proj_file = File.join(repo_dir, '.stash-proj')
+
+      if File.exist?(proj_file)
+        say 'using project from .stash-proj file'
+        project_name = File.read('.stash-proj').strip
+
+        # If you're declaring the project it had better exist
+        unless configatron.projects.has_key?(project_name)
+          say "!! project: #{project_name} requested but not defined !!"
+          say 'add this project to your .stash_cli.yml or remove the .stash-proj file'
+          exit 1
+        end
+      else
+        project_name = File.basename(repo_dir)
+      end
+
+      if configatron.projects.has_key?(project_name)
+        say "using defined project: #{project_name}"
+        @project = Project.new(
+          configatron.projects[project_name].project,
+          configatron.projects[project_name].source_slug,
+          configatron.projects[project_name].target_slug,
+          configatron.projects[project_name].target_branch)
+
+      else
+        @project = Project.new(
+          configatron.defaults.project,
+          configatron.defaults.source_slug,
+          configatron.defaults.target_slug,
+          configatron.defaults.target_branch)
+      end
     end
 
     def ask_required(statement, *args)

data/lib/stash_cli/git_utils.rb

@@ -1,5 +1,9 @@
 module StashCLI
   module GitUtils
+    def self.repo_dir
+      `git rev-parse --show-toplevel`.strip
+    end
+
     def self.current_branch
       `git rev-parse --abbrev-ref HEAD`.strip
     end

data/lib/stash_cli/project.rb

@@ -0,0 +1,12 @@
+module StashCLI
+  class Project
+    attr_reader :project, :source_slug, :target_slug, :target_branch
+
+    def initialize(project, source_slug, target_slug, target_branch)
+      @project = project
+      @source_slug = source_slug
+      @target_slug = target_slug
+      @target_branch = target_branch
+    end
+  end
+end

data/lib/stash_cli/pull_request.rb

@@ -4,7 +4,7 @@ module StashCLI
 
     def self.from_response(response, base_url)
       id = response['id']
-      url = File.join(base_url, response['link']['url'])
+      url = response['links']['self'].first['href']
       PullRequest.new(id, url)
     end
 

data/lib/stash_cli/templates/stash_cli.yml.erb

@@ -12,6 +12,16 @@ defaults:
   target_slug: <%= @target %>
   target_branch: <%= @target_branch %>
 
+# You can specify a list of projects here. Projects are detected via the
+# basename of the git repo directory or via a .stash-proj file at
+# <git repo basename>/.stash-proj. The must contain one line: the project name
+# projects:
+#   my-proj:
+#     project: FOO
+#     source_slug: bar
+#     target_slug: baz
+#     target_branch: master
+
 # You can always specify reviewers in interactive mode, but these are here to
 # provide convenient sets of frequently-included reviewers. The names here are
 # the "names" for the desired set of stash users. You can get a (limit 1000)

data/lib/stash_cli/version.rb

@@ -1,3 +1,3 @@
 module StashCli
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Matt Chun-Lum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron
@@ -144,6 +144,7 @@ files:
 - lib/stash_cli/cli.rb
 - lib/stash_cli/client.rb
 - lib/stash_cli/git_utils.rb
+- lib/stash_cli/project.rb
 - lib/stash_cli/pull_request.rb
 - lib/stash_cli/templates/stash_cli.yml.erb
 - lib/stash_cli/version.rb