github-control 0.9.0 → 0.9.1

data/lib/github-control.rb

@@ -1,14 +1,7 @@
 require 'yaml'
-
-begin
-  require 'json'
-rescue LoadError
-  require 'rubygems'
-  require 'json'
-end
-
-require 'rest_client'
+require 'json'
 require 'nokogiri'
+require 'rack/client'
 
 module GithubControl
   class Error < StandardError; end
@@ -25,7 +18,6 @@ require 'github-control/user'
 require 'github-control/repository'
 require 'github-control/repositories'
 require 'github-control/collaborators'
-require 'github-control/post_receive_urls'
 
 require 'github-control/action'
 require 'github-control/actions/repositories'

data/lib/github-control/action.rb

@@ -1,5 +1,13 @@
 module GithubControl
   class Action
+    def self.register(name)
+      Action.set[name.to_s] = self
+    end
+
+    def self.set
+      @set ||= {}
+    end
+
     def initialize(cli)
       @cli = cli
     end

data/lib/github-control/actions/add_collaborators.rb

@@ -1,6 +1,8 @@
 module GithubControl
   module Actions
     class AddCollaborators < Action
+      register :add_collab
+
       def add_options(parser)
         parser.on("-R name", "--repository name", "The repository on Github") do |repository_name|
           options[:repository_name] = repository_name
@@ -17,13 +19,13 @@ module GithubControl
         if repository.collaborators.include?(user)
           puts "#{user.name} is already a collaborator"
         else
-          repository.collaborators << user
+          repository.collaborators.create(user.name)
           puts "Done"
         end
       end
 
       def repository
-        @cli.console.current_user.repo_for(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
+        @cli.console.current_user.repositories.get(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
       end
 
       def user

data/lib/github-control/actions/collaborators.rb

@@ -1,6 +1,8 @@
 module GithubControl
   module Actions
     class Collaborators < Action
+      register :collab
+
       def add_options(parser)
         parser.on("-R name", "--repository name", "The repository on Github") do |repository_name|
           options[:repository_name] = repository_name
@@ -20,11 +22,15 @@ module GithubControl
       end
 
       def repository
-        user.repo_for(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
+        user.repositories.get(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
       end
 
       def user
-        @cli.console.user_for(options[:user_name] || raise(ProblemWithOptions, "Please specify a user"))
+        if options[:user_name]
+          @cli.console.user_for(options[:user_name])
+        else
+          @cli.console.current_user
+        end
       end
     end
   end

data/lib/github-control/actions/remove_collaborators.rb

@@ -1,6 +1,8 @@
 module GithubControl
   module Actions
     class RemoveCollaborators < Action
+      register :remove_collab
+
       def add_options(parser)
         parser.on("-R name", "--repository name", "The repository on Github") do |repository_name|
           options[:repository_name] = repository_name
@@ -17,13 +19,13 @@ module GithubControl
         unless repository.collaborators.include?(user)
           puts "#{user.name} is not a collaborator"
         else
-          repository.collaborators.delete(user)
+          repository.collaborators.delete(user.name)
           puts "Done"
         end
       end
 
       def repository
-        @cli.console.current_user.repo_for(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
+        @cli.console.current_user.repositories.get(options[:repository_name] || raise(ProblemWithOptions, "Please specify a repository"))
       end
 
       def user

data/lib/github-control/actions/repositories.rb

@@ -1,6 +1,8 @@
 module GithubControl
   module Actions
     class Repositories < Action
+      register :list
+
       def add_options(parser)
         parser.on("-U name", "--user name", "The user to list the repositories") do |user_name|
           options[:user_name] = user_name

data/lib/github-control/actions/shell.rb

@@ -3,6 +3,8 @@ require 'irb'
 module GithubControl
   module Actions
     class Shell < Action
+      register :shell
+
       def add_options(parser)
       end
 

data/lib/github-control/cli.rb

@@ -15,8 +15,6 @@ module GithubControl
       option_parser.parse!(@args)
       current_action.call
     rescue ProblemWithOptions, OptionParser::ParseError => e
-      puts e.backtrace
-      $stderr.puts
       $stderr.puts e.message
       $stderr.puts
       $stderr.puts option_parser
@@ -28,46 +26,44 @@ module GithubControl
     end
 
     def create_action
-      case action_name
-      when "list"
-        Actions::Repositories.new(self)
-      when "shell"
-        Actions::Shell.new(self)
-      when "collab"
-        Actions::Collaborators.new(self)
-      when "add_collab"
-        Actions::AddCollaborators.new(self)
-      when "remove_collab"
-        Actions::RemoveCollaborators.new(self)
+      if action = Action.set[action_name]
+        action.new(self)
       else
-        raise ProblemWithOptions, "#{action_name} is not a valid action"
+        raise ProblemWithOptions, "#{action_name} is not a valid action\nChoose one of #{available_actions}"
       end
     end
 
     def action_name
-      @action_name ||= @args.shift || raise(ProblemWithOptions, "Please provide an action to run")
+      @action_name ||= @args.shift || raise(ProblemWithOptions,
+        "Please provide an action to run\nChoose one of #{available_actions}")
+    end
+
+    def available_actions
+      Action.set.keys.join(", ")
     end
 
     def console
-      @console ||= Console.new(user_config)
+      @console ||= Console.new(config)
     end
 
-    def user_config
-      config["user"] || raise(ProblemWithOptions, "You need to provide user data in the YAML file")
+    def environment
+      @env ||= options[:environment] || raise(ProblemWithOptions,
+        "Please provide an environment to use")
     end
 
     def config
-      @config ||= YAML.load_file(config_filename)
+      @config ||= YAML.load_file(config_file)[environment]
     end
 
-    def config_filename
-      options[:config_filename] || raise(ProblemWithOptions, "You need to provide the path to the YAML filename")
+    def config_file
+      options[:config] || raise(ProblemWithOptions,
+        "You need to provide the path to the YAML filename")
     end
 
     def options
       @options ||= {
         :debug => false,
-        :argv => @args,
+        :argv  => @args,
       }
     end
 
@@ -86,7 +82,11 @@ module GithubControl
         }
 
         opts.on("-c filename", "--config filename", "Load the config from this YAML file") do |filename|
-          options[:config_filename] = filename
+          options[:config] = filename
+        end
+
+        opts.on("-e ENV", "Access this environment") do |env|
+          options[:environment] = env
         end
 
         opts.on("-v", "--version", "Display the github version, and exit.") do

data/lib/github-control/collaborators.rb

@@ -11,17 +11,33 @@ module GithubControl
     def create(user)
       @repository.owner.cli.post("/repos/collaborators/" \
         "#{@repository.name}/add/#{user}")
+      if loaded?
+        set << @repository.owner.cli.user_for(user)
+      else
+        set
+      end
     end
 
     def delete(user)
       @repository.owner.cli.post("/repos/collaborators/" \
         "#{@repository.name}/remove/#{user}")
+      if loaded?
+        set.delete_if { |u| u.name == user }
+      end
     end
 
     def each(&block)
       set.each(&block)
     end
 
+    def size
+      set.size
+    end
+
+    def loaded?
+      @set
+    end
+
     def set
       @set ||= json_data["collaborators"].map { |name|
         @repository.owner.cli.user_for(name)

data/lib/github-control/console.rb

@@ -15,32 +15,18 @@ module GithubControl
 
     def post(path, params={})
       params.merge!(:login => user_name, :token => user_token)
-      data = JSON.parse(RestClient.post(url_for(path), params))
+      data = JSON.parse(Rack::Client.post(url_for(path), params).body)
       if error = data["error"]
-        raise APIError, error.first["error"]
+        raise APIError, error.inspect
       else
         data
       end
     end
 
-    def get(path, params={})
-      RestClient.get(url_for(path), params)
-    end
-
     def url_for(path)
       "http://github.com/api/v2/json#{path}"
     end
 
-    def cookies
-      @cookies ||= session_cookie
-    end
-
-    def session_cookie
-      response = raw_post("/session", {:login => user_name,
-        :password => user_password}, {}, :auto_redirect => false)
-      response.headers[:set_cookie].split(";").first
-    end
-
     def user_name
       @user_config["name"] ||
         raise(ProblemWithOptions, "You need to provide the user name in the YAML file")

data/lib/github-control/repositories.rb

@@ -18,6 +18,10 @@ module GithubControl
     end
 
     def [](name)
+      get(name)
+    end
+
+    def get(name)
       set.detect { |r| r.name == name }
     end
 

data/lib/github-control/version.rb

@@ -1,3 +1,3 @@
 module GithubControl
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: github-control
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tim Carey-Smith
@@ -9,28 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 -08:00
+date: 2009-12-29 00:00:00 +13:00
 default_executable: github-control
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-client
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 0.2.2
     version: 
 description: github-control allows you to interact with Github through a nice ruby interface
 email: tim@spork.in
@@ -51,16 +61,11 @@ files:
 - lib/github-control/cli.rb
 - lib/github-control/collaborators.rb
 - lib/github-control/console.rb
-- lib/github-control/post_receive_urls.rb
 - lib/github-control/repositories.rb
 - lib/github-control/repository.rb
 - lib/github-control/user.rb
 - lib/github-control/version.rb
 - lib/github-control.rb
-- spec/github_control_spec.rb
-- spec/models/post_receive_urls_spec.rb
-- spec/models/user_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/halorgium/github-control
 licenses: []

data/lib/github-control/post_receive_urls.rb

@@ -1,54 +0,0 @@
-module GithubControl
-  class PostReceiveUrls
-    include Enumerable
-
-    def initialize(repository)
-      @repository = repository
-    end
-    attr_reader :repository
-
-    def <<(url)
-      update_with(set + [url])
-    end
-
-    def delete(url)
-      update_with(set - [url])
-    end
-
-    def clear
-      update_with([])
-    end
-
-    def update_with(urls)
-      form_data = []
-      urls.each do |url|
-        value = URI.escape(url.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-        form_data << "urls[]=#{value}"
-      end
-      @repository.owner.cli.scrape_post("/#{@repository.owner.name}/#{@repository.name}/edit/postreceive_urls",
-                                        form_data.join("&"), :accept => 'text/javascript')
-    end
-
-    def empty?
-      set.empty?
-    end
-
-    def each(&block)
-      set.each(&block)
-    end
-
-    def set
-      set = []
-      doc = Nokogiri::HTML(html_data)
-      doc.search("fieldset#postreceive_urls.service-hook form p input[name='urls[]']").each do |input|
-        set << input["value"] if input["value"]
-      end
-      set
-    end
-
-    def html_data
-      @repository.owner.cli.scrape_get("/#{@repository.owner.name}/#{@repository.name}/edit/hooks")
-    end
-  end
-end
-

data/spec/github_control_spec.rb

@@ -1,53 +0,0 @@
-require "spec_helper"
-
-describe "Github Control" do
-  def config
-    @config ||= YAML.load_file("spec/config.yml")["user"]
-  end
-
-  def console
-    @console ||= GithubControl::Console.new(config)
-  end
-
-  def current_user
-    @user ||= console.current_user
-  end
-
-  before(:all) do
-    RestClient.log = "restclient.log"
-  end
-
-  before(:each) do
-    current_user.repositories.destroy
-  end
-
-  it "creates a public repository" do
-    current_user.should have(:no).repositories
-    current_user.repositories.create("public-repo", :public)
-    current_user.should have(1).repositories
-    current_user.repositories["public-repo"].should be_public
-  end
-
-  it "creates a private repository" do
-    current_user.should have(:no).private_repositories
-    current_user.repositories.create("private-repo", :private)
-    current_user.should have(1).private_repositories
-    current_user.repositories["private-repo"].should be_private
-  end
-
-  it "creates and destroys collaborators on a repository" do
-    repo = current_user.repositories.create("test-repo", :public)
-    repo.collaborators << GithubControl::User.new("atmos", console)
-    repo.collaborators << GithubControl::User.new("tim", console)
-    repo.collaborators << GithubControl::User.new("ben", console)
-    repo.collaborators << GithubControl::User.new("sr", console)
-
-    repo.should have(4).collaborators
-
-    # sorry dude :(
-    repo.collaborators.delete("atmos")
-    repo.should have(3).collaborators
-  end
-
-  it "adds and remove post-receive urls"
-end

data/spec/models/post_receive_urls_spec.rb

@@ -1,46 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "Post-receive URLs" do
-  describe "for a repository with a single URL" do
-    before(:each) do
-      @repo = @console.current_user.repo_for("with-one-post-receive-url")
-    end
-
-    it "can be fetched" do
-      @repo.post_receive_urls.to_a.should == ["http://github-control.r.spork.in/post-receive"]
-    end
-  end
-
-  describe "for a repository with no URLs" do
-    before(:each) do
-      @repo = @console.current_user.repo_for("with-no-post-receive-urls")
-      @repo.post_receive_urls.clear
-    end
-
-    it "can be fetched" do
-      @repo.post_receive_urls.should be_empty
-    end
-
-    it "adds a new URL" do
-      @repo.post_receive_urls << "http://example.org"
-      @repo.post_receive_urls.to_a.should == ["http://example.org"]
-    end
-  end
-
-  describe "for a repository with 3 URLs" do
-    before(:each) do
-      @repo = @console.current_user.repo_for("with-three-post-receive-urls")
-      urls = ["http://example.com/1", "http://example.com/2", "http://example.com/3"]
-      @repo.post_receive_urls.update_with(urls)
-    end
-
-    it "can be fetched" do
-      @repo.post_receive_urls.to_a.should == ["http://example.com/1", "http://example.com/2", "http://example.com/3"]
-    end
-
-    it "adds a new URL" do
-      @repo.post_receive_urls.delete("http://example.com/1")
-      @repo.post_receive_urls.to_a.should == ["http://example.com/2", "http://example.com/3"]
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-require 'spec'
-require 'randexp'
-require "pp"
-
-require File.dirname(__FILE__) + '/../lib/github-control'
-
-Spec::Runner.configure do |config|
-  config.mock_with(:rr)
-  config.before(:all) do
-    @console = GithubControl::Console.new(YAML.load_file(File.dirname(__FILE__) + '/config.yml')["user"])
-  end
-end