hubbard 0.0.6 → 0.0.7

data/.gitignore

@@ -19,4 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-/data
+/data

data/Rakefile

@@ -11,10 +11,9 @@ begin
     gem.homepage = "http://github.com/mfoemmel/hubbard"
     gem.authors = ["Matthew Foemmel"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.files << Dir['commands/*.rb']
+    gem.files << Dir['commands/*.rb'] + Dir['lib/**/*.rb']
     gem.bindir = 'bin'
     gem.executables << 'hubbard'
-    gem.require_path = ''
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/hubbard

@@ -1,17 +1,28 @@
 #!/usr/bin/env ruby
-
 require 'fileutils'
-require 'socket'
-
-PROJECT_REGEX='[a-zA-Z0-9\-]{1,32}'
-REPOSITORY_REGEX='[a-zA-Z0-9\-]{1,32}'
-USERNAME_REGEX='[a-zA-Z0-9\-]{1,32}'
-
-HUB_DATA = ENV['HUB_DATA'] || File.expand_path("~/.hubbard")
-HUB_HOST = ENV['HUB_HOST'] || Socket.gethostname
+require 'optparse'
+require 'yaml'
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
+require 'hubbard'
+
+defaults = { :format => :text }
+options = {}
+OptionParser.new do |opts|
+  formats = [:text, :yaml]
+  opts.on("--private", "Create project with visibility set to private") do |o|
+    options[:private] = o
+  end
+  opts.on("-f", "--format [FORMAT]", formats,
+          "Select format (#{formats.join(', ')})") do |o|
+    options[:format] = o
+  end
+end.parse!
+OPTIONS = defaults.merge(options)
+OPTIONS.freeze
 
-FileUtils.mkdir_p(File.join(HUB_DATA, "projects"))
-FileUtils.mkdir_p(File.join(HUB_DATA, "accounts"))
+FileUtils.mkdir_p(File.join(Hubbard::HUB_DATA, "projects"))
+FileUtils.mkdir_p(File.join(Hubbard::HUB_DATA, "accounts"))
 
 def next_arg(msg)
   if ARGV.length < 1
@@ -29,21 +40,21 @@ def check_status(msg)
 end
 
 def validate_project_name(name)
-  if name !~ /#{PROJECT_REGEX}/
+  if name !~ /#{Hubbard::PROJECT_REGEX}/
     $stderr.put "Project names can only contain letter, numbers, and hyphens"
     exit 1
   end 
 end
 
 def validate_repository_name(name)
-  if name !~ /#{REPOSITORY_REGEX}/
+  if name !~ /#{Hubbard::REPOSITORY_REGEX}/
     $stderr.put "Repository names can only contain letter, numbers, and hyphens"
     exit 1
   end 
 end
 
 def validate_user_name(name)
-  if name !~ /#{USERNAME_REGEX}/
+  if name !~ /#{Hubbard::USERNAME_REGEX}/
     $stderr.put "User names can only contain letter, numbers, and hyphens"
     exit 1
   end 
@@ -116,11 +127,11 @@ def is_authorized(project_name, action)
 end
 
 def find_account_dir(user_name)
-  File.join(HUB_DATA, "accounts", user_name)
+  File.join(Hubbard::HUB_DATA, "accounts", user_name)
 end
 
 def find_project_dir(project_name)
-  File.join(HUB_DATA, "projects", project_name)
+  File.join(Hubbard::HUB_DATA, "projects", project_name)
 end
 
 def find_repository_dir(project_name, repository_dir)
@@ -147,13 +158,13 @@ end
 
 def sync_keys
   File.open(File.expand_path("~/.ssh/authorized_keys"), "w") do |file|
-    Dir.entries(File.join(HUB_DATA, "accounts")).each do |account|
+    Dir.entries(File.join(Hubbard::HUB_DATA, "accounts")).each do |account|
       next if account == '.' || account == '..'
-      key_dir = File.join(HUB_DATA, "accounts", account, "keys")
+      key_dir = File.join(Hubbard::HUB_DATA, "accounts", account, "keys")
       Dir.entries(key_dir).each do |name|
         next if name == '.' || name == '..'
         key = File.read(File.join(key_dir, name))
-        file << "command=\"hubbard #{@username}\" #{key} #{name}\n" 
+        file << %Q~command="hubbard #{account}",no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty #{key} #{name}\n~
       end
     end
   end

data/commands/create-project.rb

@@ -9,6 +9,6 @@ end
 unless Dir.mkdir(dir)
   $stderr.puts "Unable to create directory: #{dir}"
 end
-visibility = ARGV.member?("--private") ? "private" : "public"
+visibility = OPTIONS[:private] ? "private" : "public"
 File.open(File.join(dir, ".permissions"), "w") { |f| f << "#{@username}=admin\n" }
 File.open(File.join(dir, ".visibility"), "w") { |f| f << "#{visibility}\n" }

data/commands/git-receive-pack.rb

@@ -1,4 +1,4 @@
-unless ARGV.shift =~ /(#{PROJECT_REGEX})\/(#{REPOSITORY_REGEX}).git/
+unless ARGV.shift =~ /(#{Hubbard::PROJECT_REGEX})\/(#{Hubbard::REPOSITORY_REGEX}).git/
   $stderr.puts "Repository not found"
   exit 1
 end

data/commands/git-upload-pack.rb

@@ -1,4 +1,4 @@
-unless ARGV.shift =~ /(#{PROJECT_REGEX})\/(#{REPOSITORY_REGEX}).git/
+unless ARGV.shift =~ /(#{Hubbard::PROJECT_REGEX})\/(#{Hubbard::REPOSITORY_REGEX}).git/
   $stderr.puts "Repository not found"
   exit 1
 end

data/commands/list-forks.rb

@@ -3,7 +3,7 @@ repository_name = read_repository_name
 authorize(project_name, 'read')
 forkid = Dir.chdir(find_repository_dir(project_name, repository_name)) { `git config --get hubbard.forkid` }
 project_dir = find_project_dir(project_name)
-Dir.foreach(File.join(HUB_DATA, 'projects')) do |dir|
+Dir.foreach(File.join(Hubbard::HUB_DATA, 'projects')) do |dir|
   next if dir == "." || dir == ".."
   next unless is_authorized(dir, 'read')
   Dir.foreach(find_project_dir(project_name)) do |repository_name|

data/commands/list-keys.rb

@@ -1,5 +1,12 @@
+keys = [] 
 dirname = File.join(find_account_dir(@username), "keys")
 Dir.entries(dirname).each do |name|
   next if name == '.' || name == '..'
-  puts name
+  keys << name
+end
+
+if OPTIONS[:format] == :yaml
+  puts YAML::dump(keys)
+else
+  keys.each { |k| puts k }
 end

data/commands/list-projects.rb

@@ -1,6 +1,13 @@
-Dir.foreach(File.join(HUB_DATA, 'projects')) do |dir|
+projects = []
+Dir.foreach(File.join(Hubbard::HUB_DATA, 'projects')) do |dir|
   next if dir == "." || dir == ".."
   if is_authorized(dir, 'read')
-    puts dir
+    projects << dir
   end
 end
+
+if OPTIONS[:format] == :yaml
+  puts YAML::dump(projects)
+else
+  projects.each { |p| puts p }
+end

data/commands/list-repositories.rb

@@ -1,7 +1,14 @@
 project_name = read_project_name
 authorize(project_name, 'read')
+repositories = []
 Dir.foreach(find_project_dir(project_name)) do |repository_name|
   next if repository_name =~ /^\./
-  git_url = "#{ENV['USER']}@#{HUB_HOST}:#{project_name}/#{repository_name}.git"
-  puts "#{repository_name}\t#{git_url}"
+  git_url = "#{ENV['USER']}@#{Hubbard::HUB_HOST}:#{project_name}/#{repository_name}.git"
+  repositories << { :name => repository_name, :url => git_url }
+end
+
+if OPTIONS[:format] == :yaml
+  puts YAML::dump(repositories)
+else
+  repositories.each { |r| puts "#{r[:name]}\t#{r[:url]}" }
 end

data/commands/list-users.rb

@@ -1,4 +1,11 @@
-Dir.entries(File.join(HUB_DATA, "accounts")).each do |entry|
+users = [] 
+Dir.entries(File.join(Hubbard::HUB_DATA, "accounts")).each do |entry|
   next if entry == '.' || entry == '..'
-  puts entry
+  users << entry
+end
+
+if OPTIONS[:format] == :yaml
+  puts YAML::dump(users)
+else
+  users.each { |u| puts u }
 end

data/lib/hubbard.rb

@@ -0,0 +1,10 @@
+require 'socket'
+
+module Hubbard
+  PROJECT_REGEX='[a-zA-Z0-9\-]{1,32}'
+  REPOSITORY_REGEX='[a-zA-Z0-9\-]{1,32}'
+  USERNAME_REGEX='[a-zA-Z0-9\-]{1,32}'
+
+  HUB_DATA = ENV['HUB_DATA'] || File.expand_path("~/.hubbard")
+  HUB_HOST = ENV['HUB_HOST'] || Socket.gethostname
+end

data/spec/hubbard_spec.rb

@@ -1,44 +1,9 @@
-# Something in the Rakefile is generating 
-# a bunch of GIT_* environment variables,
-# which mess everything up, so undo.
-ENV.each do |key,value|
-  ENV[key] = nil if key =~ /^GIT_/
-end
-
-HUB=File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "hubbard"))
-
+require 'spec_helper'
 require 'fileutils'
 
-ENV['HUB_USER'] = HUB_USER = "hub"
-ENV['HUB_HOST'] = HUB_HOST = "example.com"
-ENV['HUB_DATA'] = HUB_DATA =  File.expand_path(File.join(File.dirname(__FILE__), '..', "data"))
-ENV['GIT_SSH'] = File.expand_path(File.join(File.dirname(__FILE__), "gitssh"))
-
-def hub(username, command, input=nil)
-  if input
-    result = `echo #{input} | #{HUB} #{username} #{command}`
-  else
-    result = `#{HUB} #{username} #{command}`
-  end
-  if $?.exitstatus != 0
-    raise "Command failed: hub #{username} #{command}\n#{result}"
-  end
-  result
-end
-
-def git(username, command)
-  ENV['HUB_USERNAME'] = username
-  result = `git #{command}`
-  if $?.exitstatus != 0
-    raise "Command failed: git #{command}:\n#{result}"
-  end
-  result
-end
-
 describe "Hubble" do
   before(:each) do
-    FileUtils.rm_rf HUB_DATA
-    FileUtils.rm_rf "tmp"
+    reset_file_system
   end
 
   it "should create project" do

data/spec/spec_helper.rb

@@ -5,5 +5,43 @@ require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+end
+
+# Something in the Rakefile is generating
+# a bunch of GIT_* environment variables,
+# which mess everything up, so undo.
+ENV.each do |key,value|
+  ENV[key] = nil if key =~ /^GIT_/
+end
+
+HUB=File.expand_path(File.join(File.dirname(__FILE__), "..", "bin", "hubbard"))
+ENV['HUB_USER'] = HUB_USER = "hub"
+ENV['HUB_HOST'] = HUB_HOST = "example.com"
+ENV['HUB_DATA'] = HUB_DATA =  File.expand_path(File.join(File.dirname(__FILE__), '..', "data"))
+ENV['GIT_SSH'] = File.expand_path(File.join(File.dirname(__FILE__), "gitssh"))
+
+def hub(username, command, input=nil)
+  if input
+    result = `echo #{input} | #{HUB} #{username} #{command}`
+  else
+    result = `#{HUB} #{username} #{command}`
+  end
+  if $?.exitstatus != 0
+    raise "Command failed: hub #{username} #{command}\n#{result}"
+  end
+  result
+end
+
+def git(username, command)
+  ENV['HUB_USERNAME'] = username
+  result = `git #{command}`
+  if $?.exitstatus != 0
+    raise "Command failed: git #{command}:\n#{result}"
+  end
+  result
+end
+
+def reset_file_system
+  FileUtils.rm_rf HUB_DATA
+  FileUtils.rm_rf "tmp"
 end

data/spec/yaml_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'yaml'
+
+YAML_OPTION=" -f yaml "
+describe "Hubble with yaml output" do
+  before(:each) do
+    reset_file_system
+  end
+
+  it "should load list-projects" do
+    hub("yammer", "create-project a")
+    hub("yammer", "create-project b")
+    hub("yammer", "create-project c")
+
+    projects = YAML::load(hub("#{YAML_OPTION} yammer", "list-projects"))
+    projects.should == ["a", "b", "c"]
+  end
+
+  it "should create repositories" do
+    hub("yammer", "create-project a")
+    hub("yammer", "create-repository a b")
+
+    repositories = YAML::load(hub("yammer", "#{YAML_OPTION} list-repositories a"))
+    repositories.length.should == 1
+    repositories.first[:name].should == "b"
+    repositories.first[:url].should == "#{ENV['USER']}@#{HUB_HOST}:a/b.git"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hubbard
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 -06:00
+date: 2010-01-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +26,6 @@ description: Hubbard is a command line tool for managing git repositories.
 email: git@foemmel.com
 executables: 
 - hubbard
-- hubbard~
 - hubbard
 extensions: []
 
@@ -63,6 +62,7 @@ files:
 - spec/hubbard_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/yaml_spec.rb
 has_rdoc: true
 homepage: http://github.com/mfoemmel/hubbard
 licenses: []
@@ -71,7 +71,7 @@ post_install_message:
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
-- ""
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -92,5 +92,6 @@ signing_key:
 specification_version: 3
 summary: Hubbard is a command line tool for managing git repositories.
 test_files: 
+- spec/yaml_spec.rb
 - spec/hubbard_spec.rb
 - spec/spec_helper.rb