toolshed 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d7f36f7fce51b7916aad6741cf12e62ed18aebd
-  data.tar.gz: 9e1784114b5981be500e3b21a919f7d7c6ea6e3d
+  metadata.gz: b797dd6cddae38cc2f9e8c1f7916108727dac003
+  data.tar.gz: 1a39f45e8b150de27a7c6eecbc5fdf9668644b8f
 SHA512:
-  metadata.gz: 50b81af0fbc10f5f14c453e61a841ec36f14283b6eb3792034175bddc681c0b4e33c8d3793149bb7a886e3ea7155d10323e98f907b2fe3b8b8c90b0cfb05f288
-  data.tar.gz: d19487356cfdebde1a0dfeca6c2008dda41de775ce9c5ee2e9dcd6e8ffac15c2bf5631d15ea1fa5e7c5b3c399533a8810ca3dee1a459f81d7d569c7957ce451c
+  metadata.gz: 09b0e55117a1bc5bc9d62464a26b576576040ef8be4ecf3b6e6b44e3f5d847aebaf9784437f0b125957fae55b07880bf7eeec2ec292d93c5ef08ec999f68eb40
+  data.tar.gz: f5782e3a4ebbb447f45b83544e962c101e2cb6991e737d9b7c5fc081de15a7f2300bb6af34392e9b547539ed8518b29dc494877ef181c69d3baf38aea225756c

data/README.md

@@ -1,6 +1,6 @@
 # Toolshed
 
-TODO: Write a gem description
+Toolshed is a utility gem meant to make small tasks faster. This includes things like making a pull request up to Github all the way to creating a branch. This gem can be extended to used else where also.
 
 ## Installation
 
@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+After install the gem run toolshed for help menu. It will list the available commands.
 
 ## Contributing
 

data/bin/toolshed.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-
 require 'toolshed'
 require 'toolshed/cli'
 
@@ -11,23 +10,24 @@ require 'optparse'
 
 def usage
   $stderr.puts <<EOF
-This is the command line tool for toolshed. More information about toolshed can
+Command line tool for toolshed. More information about toolshed can
 be found at https://github.com/wallerjake/toolshed
 
-Before using this tool you should create a file called .toolshed in your home directory
-and add the following to that file:
+Before using this tool you should create a file called .toolshedrc in your projects directory or home directory if you want to use the settings globally.
+Note that it will only read one file which ever file is closest to the directory you are in. Then and add the following to that file:
 
-  use_pivotal_tracker: true
-  pivotal_tracker_username: [pivotal_tracker_username]
-  pivotal_tracker_password: [pivotal_tracker_password]
-  default_pivotal_tracker_project_id: [project_id]
-  github_username: [github_username]
-  github_password: [github_password]
-  branched_from_remote_name: [branched_from_remote_name]
-  branched_from_user: [branched_from_username]
-  branched_from_repo_name: [branched_from_repo_name]
-  push_from_user: [push_from_yourself]
-  push_to_myself: [push_to_yourself]
+  use_pivotal_tracker: true (required)
+  pivotal_tracker_username: [pivotal_tracker_username] (optional)
+  pivotal_tracker_password: [pivotal_tracker_password] (optional)
+  default_pivotal_tracker_project_id: [project_id] (optional)
+  github_username: [github_username] (optional)
+  github_password: [github_password] (optional)
+  branched_from_remote_name: [branched_from_remote_name] (required)
+  branched_from_user: [branched_from_username] (required)
+  branched_from_repo_name: [branched_from_repo_name] (required)
+  push_from_user: [push_from_yourself] (required)
+  push_to_myself: [push_to_yourself] (required)
+  use_git_submodules: false (optional)
 
 == Commands
 
@@ -40,6 +40,9 @@ create_github_pull_request              # create a github pull request based on
 get_pivotal_tracker_story_information   # Get the ticket information from a PivotalTracker story based on project_id and story_id
 create_pivotal_tracker_note             # Create a note for a specific PivotalTracker story based on project_id and story_id
 update_pivotal_tracker_story_status     # Update the status of PivotalTracker story
+create_git_branch                       # Create a git branch and push it to your local repository
+checkout_git_branch                     # Checkout a git branch and update the submodules if you use them
+push_git_branch                         # Push your current working branch to your own repository
 EOF
 end
 
@@ -47,19 +50,29 @@ if $0.split("/").last == 'toolshed'
   options = {}
 
   global = OptionParser.new do |opts|
-    opts.on("-u", "--username [ARG]") do |username|
-      # Set username here
+    opts.on("-u", "--github_username [ARG]") do |username|
+      Toolshed::Client.github_username = username
+    end
+    opts.on("-p", "--github_password [ARG]") do |password|
+      Toolshed::Client.github_password = password
+    end
+    opts.on("-u", "--pivotal_tracker_username [ARG]") do |username|
+      Toolshed::Client.pivotal_tracker_username = username
+    end
+    opts.on("-p", "--pivotal_tracker_password [ARG]") do |password|
+      Toolshed::Client.pivotal_tracker_password = password
     end
-    opts.on("-p", "--password [ARG]") do |password|
-      # Set password here
+    opts.on("-d", "--debug [ARG]") do
+      Toolshed::Client.debug = true
     end
-    opts.on("-d") do
-      # Set debug here
+    opts.on("-h", "--help", "Help") do
+      usage
     end
   end
 
-  subcommands = { }
+  subcommands = {}
 
+  global.order!
   command = ARGV.shift
   if command.nil? || command == 'help'
     usage

data/lib/toolshed/cli.rb

@@ -25,13 +25,18 @@ module Toolshed
         'create_pivotal_tracker_note'           => Toolshed::Commands::CreatePivotalTrackerNote,
         'get_pivotal_tracker_story_information' => Toolshed::Commands::GetPivotalTrackerStoryInformation,
         'update_pivotal_tracker_story_status'   => Toolshed::Commands::UpdatePivotalTrackerStoryStatus,
+        'create_git_branch'                     => Toolshed::Commands::CreateGitBranch,
+        'checkout_git_branch'                   => Toolshed::Commands::CheckoutGitBranch,
+        'push_git_branch'                       => Toolshed::Commands::PushGitBranch,
       }
     end
   end
-
 end
 
 require 'toolshed/commands/create_github_pull_request'
 require 'toolshed/commands/create_pivotal_tracker_note'
 require 'toolshed/commands/get_pivotal_tracker_story_information'
 require 'toolshed/commands/update_pivotal_tracker_story_status'
+require 'toolshed/commands/create_git_branch'
+require 'toolshed/commands/checkout_git_branch'
+require 'toolshed/commands/push_git_branch'

data/lib/toolshed/client.rb

@@ -72,6 +72,14 @@ module Toolshed
       @push_to_myself = push_to_myself 
     end
 
+    def self.use_git_submodules
+      @use_git_submodules
+    end
+
+    def self.use_git_submodules=(use_git_submodules)
+      @use_git_submodules = use_git_submodules
+    end
+
 
 
     # pivotal tracker config
@@ -126,7 +134,21 @@ module Toolshed
 
     def self.load_credentials(path = config_path)
       begin
-        credentials = YAML.load_file(File.expand_path(path))
+        dir = Dir.pwd
+        while File.expand_path(dir) != '/' do
+          if (File.exists? "#{dir}/.toolshedrc")
+            loaded_from_path = "#{dir}/.toolshedrc"
+            break
+          elsif (File.exists? "#{dir}/.toolshed")
+            loaded_from_path = "#{dir}/.toolshed"
+            warn "[DEPRECATION] `.toolshed` file is being deprecated.  Please use a `.toolshedrc` file instead."
+            break
+          end
+
+          dir = File.join dir, '..'
+        end
+
+        credentials = YAML.load_file(File.expand_path(loaded_from_path))
         self.github_username                    ||= credentials['github_username']
         self.github_password                    ||= credentials['github_password']
         self.pivotal_tracker_username           ||= credentials['pivotal_tracker_username']
@@ -138,8 +160,9 @@ module Toolshed
         self.push_from_user                     ||= credentials['push_from_user']
         self.push_to_myself                     ||= credentials['push_to_myself']
         self.use_pivotal_tracker                ||= credentials['use_pivotal_tracker']
+        self.use_git_submodules                 ||= credentials['use_git_submodules']
         @credentials_loaded = true
-        puts "Credentials loaded from #{path}"
+        puts "Credentials loaded from #{File.absolute_path(loaded_from_path)}"
       rescue => error
         puts "Error loading your credentials: #{error.message}"
         exit 1

data/lib/toolshed/commands/checkout_git_branch.rb

@@ -0,0 +1,23 @@
+module Toolshed
+  module Commands
+    class CheckoutGitBranch
+      def execute(args, options = {})
+        print "Ticket ID or Branch Name? "
+        ticket_id = $stdin.gets.chomp
+
+        branch_name = `git branch | grep \"#{ticket_id}\"`.gsub("*", "").strip
+
+        git_submodule_command = ''
+        if (Toolshed::Client.use_git_submodules)
+          print "Update Submodules (y/n)? "
+          update_submodules = $stdin.gets.chomp
+          if (update_submodules == 'y')
+            git_submodule_command = "git submodule update --init;"
+          end
+        end
+
+        system("git checkout #{branch_name}; #{git_submodule_command}")
+      end
+    end
+  end
+end

data/lib/toolshed/commands/create_git_branch.rb

@@ -0,0 +1,28 @@
+module Toolshed
+  module Commands
+    class CreateGitBranch
+      def execute(args, options = {})
+          print "Branch text? "
+          branch_name = $stdin.gets.chomp
+
+          print "Branch from? "
+          branch_from = $stdin.gets.chomp
+
+          git_submodule_command = ''
+          if (Toolshed::Client.use_git_submodules)
+            print "Update Submodules (y/n)? "
+            update_submodules = $stdin.gets.chomp
+            if (update_submodules == 'y')
+              git_submodule_command = "git submodule update --init;"
+            end
+          end
+
+          branch_name = branch_name.strip.downcase.tr(" ", "_").gsub("-", "").gsub("&", "").gsub("/", "_").gsub(".", "_").gsub("'", "").gsub("__", "_").gsub(":", "")
+          output_text = "git remote update; git checkout -b #{branch_name} #{Toolshed::Client.branched_from_remote_name}/#{branch_from}; #{git_submodule_command} git push #{Toolshed::Client.push_to_myself} #{branch_name}"
+
+          puts "Creating branch.."
+          system(output_text)
+      end
+    end
+  end
+end

data/lib/toolshed/commands/create_github_pull_request.rb

@@ -10,11 +10,10 @@ module Toolshed
           if (project_id == '')
             project_id = Toolshed::Client.default_pivotal_tracker_project_id
           end
-
-          pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id})
+          pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id, username: Toolshed::PivotalTracker.username, password: Toolshed::PivotalTracker.password })
         end
 
-        github = Toolshed::Github.new
+        github = Toolshed::Github.new({ username: Toolshed::Github.username, password: Toolshed::Github.password })
 
         # see what branch is checked out and where we are branched from
         puts "Current Branch: #{github.branch_name}"

data/lib/toolshed/commands/create_pivotal_tracker_note.rb

@@ -8,7 +8,7 @@ module Toolshed
           project_id = Toolshed::Client.default_pivotal_tracker_project_id
         end
 
-        pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id})
+        pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id, username: Toolshed::PivotalTracker.username, password: Toolshed::PivotalTracker.password })
         github = Toolshed::Github.new
 
         default_story_id = Toolshed::PivotalTracker::story_id_from_branch_name(github.branch_name)

data/lib/toolshed/commands/get_pivotal_tracker_story_information.rb

@@ -9,7 +9,7 @@ module Toolshed
             project_id = Toolshed::Client.default_pivotal_tracker_project_id
           end
 
-          pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id})
+          pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id, username: Toolshed::PivotalTracker.username, password: Toolshed::PivotalTracker.password })
           github = Toolshed::Github.new
 
           default_story_id = Toolshed::PivotalTracker::story_id_from_branch_name(github.branch_name)
@@ -20,9 +20,9 @@ module Toolshed
           end
 
           result = pivotal_tracker.story_information(story_id)
-          puts "Name: #{result.name}"
-          puts "Url: #{result.url}"
-          puts "Description: #{result.description}"
+          result.instance_variables.each do |name, value|
+            puts "#{name}: #{result.instance_variable_get(name).inspect}"
+          end
           exit
         rescue => e
           puts e.message

data/lib/toolshed/commands/push_git_branch.rb

@@ -0,0 +1,10 @@
+module Toolshed
+  module Commands
+    class PushGitBranch
+      def execute(args, options = {})
+          branch_name = `git rev-parse --abbrev-ref HEAD`
+          system("git push #{Toolshed::Client.push_to_myself} #{branch_name}")
+      end
+    end
+  end
+end

data/lib/toolshed/commands/update_pivotal_tracker_story_status.rb

@@ -10,7 +10,7 @@ module Toolshed
           project_id = Toolshed::Client.default_pivotal_tracker_project_id
         end
 
-        pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id})
+        pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id, username: Toolshed::PivotalTracker.username, password: Toolshed::PivotalTracker.password })
         github = Toolshed::Github.new
 
         default_story_id = Toolshed::PivotalTracker::story_id_from_branch_name(github.branch_name)
@@ -28,7 +28,9 @@ module Toolshed
 
         begin
           result = pivotal_tracker.update_story_state(story_id, story_status)
-          puts "Story Status Updated At: #{result["created_at"]}"
+          result.each do |key, value|
+            puts "#{key}: #{value}"
+          end
         rescue => e
           puts e.message
           exit

data/lib/toolshed/github.rb

@@ -3,7 +3,18 @@ module Toolshed
     include HTTParty
 
     def initialize(options={})
-      @auth = { username: Toolshed::Client::github_username, password: Toolshed::Client::github_password }
+      username = Toolshed::Client::github_username
+      password = Toolshed::Client::github_password
+
+      unless (options[:username].nil?)
+        username = options[:username]
+      end
+
+      unless (options[:password].nil?)
+         password = options[:password]
+      end
+
+      @auth = { username: username, password: password }
       @default_options = {
         :headers => {
             "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1309.0 Safari/537.17"
@@ -50,5 +61,29 @@ module Toolshed
     def branched_from
       branched_from = `git rev-parse --abbrev-ref --symbolic-full-name @{u}`.split('/')[-1].strip
     end
+
+    def self.username
+      username = Toolshed::Client::github_username
+      if (username.nil?)
+        # prompt to ask for username
+        puts "Github username? "
+        username = $stdin.gets.chomp.strip
+      end
+
+      return username
+    end
+
+    def self.password
+      password = Toolshed::Client::github_password
+      if (password.nil?)
+        # prompt to ask for password
+        system "stty -echo"
+        puts "Github password? "
+        password = $stdin.gets.chomp.strip
+        system "stty echo"
+      end
+
+      return password
+    end
   end
 end

data/lib/toolshed/pivotal_tracker.rb

@@ -7,7 +7,19 @@ module Toolshed
     attr_accessor :project_id, :token
 
     def initialize(options={})
-      self.token = ::PivotalTracker::Client.token(Toolshed::Client.pivotal_tracker_username, Toolshed::Client.pivotal_tracker_password)
+      username = Toolshed::Client::pivotal_tracker_username
+      password = Toolshed::Client::pivotal_tracker_password
+
+      unless (options[:username].nil?)
+        username = options[:username]
+      end
+
+      unless (options[:password].nil?)
+         password = options[:password]
+      end
+
+
+      self.token = ::PivotalTracker::Client.token(username, password)
 
       self.project_id = (options[:project_id].nil?) ? Toolshed::Client.default_pivotal_tracker_project_id : options[:project_id]
       @pt_project = ::PivotalTracker::Project.find(self.project_id)
@@ -47,5 +59,29 @@ module Toolshed
         raise "validation errors #{response.inspect}"
       end
     end
+
+    def self.username
+      username = Toolshed::Client::pivotal_tracker_username
+      if (username.nil?)
+        # prompt to ask for username
+        puts "PivotalTracker username? "
+        username = $stdin.gets.chomp.strip
+      end
+
+      return username
+    end
+
+    def self.password
+      password = Toolshed::Client::pivotal_tracker_password
+      if (password.nil?)
+        # prompt to ask for password
+        system "stty -echo"
+        puts "PivotalTracker password? "
+        password = $stdin.gets.chomp.strip
+        system "stty echo"
+      end
+
+      return password
+    end
   end
 end

data/lib/toolshed/version.rb

@@ -1,3 +1,3 @@
 module Toolshed
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - test
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -100,9 +100,12 @@ files:
 - lib/toolshed/base.rb
 - lib/toolshed/cli.rb
 - lib/toolshed/client.rb
+- lib/toolshed/commands/checkout_git_branch.rb
+- lib/toolshed/commands/create_git_branch.rb
 - lib/toolshed/commands/create_github_pull_request.rb
 - lib/toolshed/commands/create_pivotal_tracker_note.rb
 - lib/toolshed/commands/get_pivotal_tracker_story_information.rb
+- lib/toolshed/commands/push_git_branch.rb
 - lib/toolshed/commands/update_pivotal_tracker_story_status.rb
 - lib/toolshed/error.rb
 - lib/toolshed/github.rb