atlassian-stash 0.1.4 → 0.1.5

data/README.md

@@ -10,7 +10,7 @@ This command line helper for Stash is written in Ruby and is deployed as a [Ruby
 Once the gem is installed, the command `stash` will be in your `$PATH`
 
 ## Configuration and usage
-Run `stash configure`. This will prompt for details about your Stash instance.
+Run `stash configure`. This will prompt for details about your Stash instance. If no password is provided, then you will be prompted for a password when executing commands to Stash. Currently, the password is stored in plain text in a configuration file, `~/.stashconfig.yml` which is protected with a permission bit of `0600`. 
 
 ### Creating a pull request
 Use the `pull-request` command to create a pull request in Stash. E.g:

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/stash

@@ -18,7 +18,7 @@ $configFile = File.join(Etc.getpwuid.dir, ".stashconfig.yml")
 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['password'] and config['stash_url']
+  raise "Stash configuration file is incomplete, please re-run configure" unless config['username'] and config['stash_url']
   config
 end
 
@@ -31,15 +31,16 @@ command 'configure' do |c|
   c.option '--stashUrl', String, 'Writes the Stash server url to the configuration file'
   c.action do |args, options|
     username = options.username ? options.username : ask("Stash Username: ")
-    password = options.password ? options.password : ask("Stash Password: ") { |q| q.echo = "*" }
+    password = options.password ? options.password : ask("Stash Password (optional): ") { |q| q.echo = "*" }
     stashUrl = options.stashUrl ? options.stashUrl : ask("Stash URL: ")
 
     c = {
-      'username' => username.to_s,
-      'password' => password.to_s,
       'stash_url' => stashUrl.to_s
     }
 
+    c['username'] = username.to_s unless username.empty?
+    c['password'] = password.to_s unless password.empty?
+
     File.open($configFile, 'w') do |out|
       YAML.dump(c, out)
     end

data/lib/atlassian/stash/pullrequest.rb

@@ -69,11 +69,17 @@ module Atlassian
 
         resource = CreatePullRequestResource.new(repoInfo.projectKey, repoInfo.slug, title, description, reviewers, source, target).resource
 
+        username = @config["username"]
+        password = @config["password"]
+
+        username = ask("Username: ") unless @config["username"]
+        password = ask("Password: ") { |q| q.echo = '*' } unless @config["password"]
+
         uri = URI.parse(@config["stash_url"].downcase)
         prPath = uri.path + '/projects/' + repoInfo.projectKey + '/repos/' + repoInfo.slug + '/pull-requests'
 
         req = Net::HTTP::Post.new(prPath, initheader = {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        req.basic_auth @config["username"], @config["password"]
+        req.basic_auth username, password
         req.body = resource.to_json
         http = Net::HTTP.new(uri.host, uri.port)
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Seb Ruiz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-30 00:00:00 +11:00
+date: 2012-11-05 00:00:00 +11:00
 default_executable: stash
 dependencies: 
 - !ruby/object:Gem::Dependency