github-api-client 0.2.2 → 0.2.4

data/Gemfile

@@ -6,7 +6,6 @@ gem "activesupport", ">= 3.0.3"
 gem "sqlite3-ruby"
 
 group :development do
-  gem "github-api-client", :path => "./"
   gem "rspec", ">= 2.3.0"
   gem "mocha"
   gem "yard", ">= 0.6.0"

data/Gemfile.lock

@@ -1,15 +1,3 @@
-PATH
-  remote: ./
-  specs:
-    github-api-client (0.2.2)
-      activerecord (>= 3.0.3)
-      activerecord (>= 3.0.3)
-      activesupport (>= 3.0.3)
-      rainbow
-      rainbow (>= 1.1)
-      sqlite3-ruby
-      sqlite3-ruby (>= 1.3.2)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -68,7 +56,6 @@ DEPENDENCIES
   activesupport (>= 3.0.3)
   bundler (>= 1.0.0)
   cucumber
-  github-api-client!
   jeweler (>= 1.5.2)
   mocha
   rainbow

data/Rakefile

@@ -13,7 +13,6 @@ require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "github-api-client"
   gem.homepage = "http://github.com/farnoy/github-api-client"
   gem.license = "MIT"
@@ -21,15 +20,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Caches retrieved information to your user profile and reuses it when you query again.}
   gem.email = "kuba@okonski.org"
   gem.authors = ["Jakub Okoński"]
-  gem.add_runtime_dependency('rainbow', '>=1.1')
-  gem.add_runtime_dependency('activerecord', '>=3.0.3')
-  gem.add_runtime_dependency('sqlite3-ruby', '>=1.3.2')
-  
-  gem.add_development_dependency 'yard', '>= 0.6.0'
-  gem.add_development_dependency 'rspec', '>= 2.3.0'
-  gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'bundler', '>= 1.0.0'
-  gem.add_development_dependency 'jeweler', '>= 1.5.2'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/api-browser.rb

@@ -7,7 +7,8 @@ puts GitHub::Config::Version
 
 unless ARGV.include? 'test'
   # Dev temporary code here
-  p GitHub::Organization.get('github')
+  #p GitHub::Organization.get('github')
+  #p GitHub::Organization.get('github').fetch(:members).members.first.organizations
 else # launches all-features code
   # Performance tests
   GitHub::Repo.get('mojombo/jekyll').fetch(:self, :watchers)
@@ -15,5 +16,6 @@ else # launches all-features code
   GitHub::Repo.get('parndt/hub').parent.fetch(:self, :watchers).watchers
   GitHub::User.get('kneath').fetch(:followers, :followings)
   GitHub::User.get('defunkt').fetch(:followers, :followings)
-  GitHub::User.get('schacon').fetch(:followers, :followings)
+  GitHub::User.get('schacon').fetch(:organizations).organizations
+  GitHub::Organization.get('github').fetch(:members).members
 end

data/db/migrate/006_create_organizations_members.rb

@@ -0,0 +1,12 @@
+class CreateOrganizationsMembers < ActiveRecord::Migration
+  def self.up
+    create_table :organizations_members, :id => false do |t|
+      t.references :user
+      t.references :organization
+    end
+  end
+  
+  def self.down
+    drop_table :user_followings
+  end
+end

data/features/fetching.feature

@@ -0,0 +1,13 @@
+Feature: Fetching Objects
+  In order to fetch objects from GitHub
+  I just need to request a function from a model
+
+  Scenario: Fetching user information
+    Given I want to fetch user "schacon"
+    Then my local database should contain that record
+    And that record's "name" should be "Scott Chacon"
+  
+  Scenario: Fetching repo information
+    Given I want to fetch repo "mojombo/jekyll"
+    Then my local database should contain that record
+    And that record's "login" of the "owner" should be "mojombo"

data/features/step_definitions/{github-api-client_steps.rb → fetching_steps.rb}

@@ -4,23 +4,23 @@ Before do
   end
 end
 
-Given /^I fetch user "(.*)"$/ do |login|
+Given /^I want to fetch user "(.*)"$/ do |login|
   @record = GitHub::User.get(login)
 end
 
-Given /^I fetch repo "(.*)"$/ do |permalink|
+Given /^I want to fetch repo "(.*)"$/ do |permalink|
   @record = GitHub::Repo.get(permalink)
 end
 
-Then /^My local database should contain that record$/ do
+Then /^my local database should contain that record$/ do
   @record.class.find(@record.id).should == @record
 end
 
-Then /^That record's "([^"]*)" should be "([^"]*)"$/ do |sig, prop|
+Then /^that record's "([^"]*)" should be "([^"]*)"$/ do |sig, prop|
   @record.send(sig.to_sym).should == prop
 end
 
-Then /^That record's "([^"]*)" of the "([^"]*)" should be "([^"]*)"$/ do |sig, type, prop|
+Then /^that record's "([^"]*)" of the "([^"]*)" should be "([^"]*)"$/ do |sig, type, prop|
   @record.send(type.to_sym).send(sig.to_sym).should == prop
 end
 

data/github-api-client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{github-api-client}
-  s.version = "0.2.2"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Okoński"]
@@ -30,8 +30,9 @@ Gem::Specification.new do |s|
     "db/migrate/003_create_repos.rb",
     "db/migrate/004_create_repo_watchings.rb",
     "db/migrate/005_create_organizations.rb",
-    "features/github-api-client.feature",
-    "features/step_definitions/github-api-client_steps.rb",
+    "db/migrate/006_create_organizations_members.rb",
+    "features/fetching.feature",
+    "features/step_definitions/fetching_steps.rb",
     "features/support/env.rb",
     "gemspec.old.orig",
     "github-api-client.gemspec",
@@ -65,7 +66,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<github-api-client>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0.6.0"])
@@ -73,20 +73,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<rainbow>, [">= 1.1"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.3"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.3.2"])
-      s.add_development_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
       s.add_dependency(%q<rainbow>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.3"])
       s.add_dependency(%q<activesupport>, [">= 3.0.3"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<github-api-client>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0.6.0"])
@@ -94,21 +85,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rainbow>, [">= 1.1"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.3"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.2"])
-      s.add_dependency(%q<yard>, [">= 0.6.0"])
-      s.add_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
     s.add_dependency(%q<rainbow>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 3.0.3"])
     s.add_dependency(%q<activesupport>, [">= 3.0.3"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<github-api-client>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.3.0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0.6.0"])
@@ -116,14 +98,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rainbow>, [">= 1.1"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.3"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.2"])
-    s.add_dependency(%q<yard>, [">= 0.6.0"])
-    s.add_dependency(%q<rspec>, [">= 2.3.0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end
 end
 

data/lib/github-api-client.rb

@@ -2,9 +2,9 @@
 
 require 'rubygems'
 require 'bundler/setup'
-gem 'github-api-client'
 
-$:.unshift Gem.loaded_specs['github-api-client'].full_gem_path # devel trick
+ROOT = File.expand_path('../', File.dirname(__FILE__))
+$:.unshift File.dirname(__FILE__)
 
 require 'net/http'
 require 'uri'

data/lib/github-api-client/config.rb

@@ -5,12 +5,12 @@ module GitHub
     Path = {
       :dir        => ENV['HOME'] + "/.github", 
       :dbfile     => ENV['HOME'] + "/.github/github.db", 
-      :migrations => Gem.loaded_specs['github-api-client'].full_gem_path +  "/db/migrate", 
+      :migrations => ROOT +  "/db/migrate", 
       :secrets    => ENV['HOME'] + "/.github" + "/secrets.yml"
     } 
     
     Version = File.read(
-      Gem.loaded_specs['github-api-client'].full_gem_path + "/VERSION"
+      ROOT + "/VERSION"
     )
     VERSION = Version
     

data/lib/github-api-client/organization.rb

@@ -1,5 +1,7 @@
 module GitHub
   class Organization < ActiveRecord::Base
+    has_and_belongs_to_many :members, :class_name => 'GitHub::User', :join_table => 'organizations_members'
+    
     def get
       self.update_attributes(
         GitHub::Base.parse_attributes(:org_get,
@@ -12,5 +14,32 @@ module GitHub
       o   = GitHub::Organization.find_by_login(login)
       o ||= GitHub::Organization.new(:login => login).get
     end
+    
+    def fetch(*things)
+      things.each do |thing|
+        case thing
+          when :self then get
+          when :members then get_members
+        end
+      end
+      self
+    end
+    
+    private
+    def get_members
+      members = YAML::load(GitHub::Browser.get "/organizations/#{login}/public_members")['users']
+      puts "Fetching members for #{"organization".color(:magenta).bright} #{self.login.color(:green).bright}"
+      i, count = 0, members.count.to_s.color(:green).bright
+      self.transaction do
+        members.each do |user|
+          i += 1
+          u = GitHub::User.find_or_create_by_login(user['login'])
+          self.members.find_or_create u
+          print "\r#{i.to_s.color(:yellow).bright}/#{count}"
+        end
+      end
+      puts nil
+      self
+    end
   end
 end

data/lib/github-api-client/user.rb

@@ -5,6 +5,9 @@ module GitHub
     has_and_belongs_to_many :followings, :foreign_key => 'following_id', :association_foreign_key => 'follower_id', :join_table => 'user_followings', :class_name => 'User'
     has_many :repos, :class_name => 'GitHub::Repo', :foreign_key => 'owner_id'
     
+    # FIXME: Does GitHub allow a user to have multiple organizations?
+    has_and_belongs_to_many :organizations, :join_table => 'organizations_members'
+    
     # Fetches info about current_user from GitHub
     # GitHub::User.new.build(:login => 'asd', :token => 'token').get #=> GitHub::User
     # @return [GitHub::User] Chainable self object after syncing attributes with GitHub
@@ -62,6 +65,7 @@ module GitHub
           when :self then get
           when :followers then get_followers
           when :followings then get_followings
+          when :organizations then get_organizations
         end
       end
       self
@@ -103,6 +107,22 @@ module GitHub
       self
     end
     
+    def get_organizations
+      organizations = YAML::load(GitHub::Browser.get "/user/show/#{login}/organizations")['organizations']
+      puts "Fetching organizations for #{"user".color(:yellow).bright} #{self.login.color(:green).bright}"
+      i, count = 0, organizations.count.to_s.color(:green).bright
+      self.transaction do
+        organizations.each do |org|
+          i += 1
+          u = GitHub::Organization.find_or_create_by_login(org['login'])
+          self.organizations.find_or_create u
+          print "\r#{i.to_s.color(:yellow).bright}/#{count}"
+        end
+      end
+      puts nil
+      self
+    end
+    
     public
     # Returns an array with logins of GitHub::User followers
     # @param [String] login GitHub login of which followers will be mapped

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Jakub Oko\xC5\x84ski"
@@ -73,22 +73,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: github-api-client
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,10 +87,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,10 +100,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,10 +115,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,10 +128,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,10 +143,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,97 +158,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rainbow
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -271,37 +171,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id020 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id020
+  version_requirements: *id011
 description: Caches retrieved information to your user profile and reuses it when you query again.
 email: kuba@okonski.org
 executables: []
@@ -325,8 +195,9 @@ files:
 - db/migrate/003_create_repos.rb
 - db/migrate/004_create_repo_watchings.rb
 - db/migrate/005_create_organizations.rb
-- features/github-api-client.feature
-- features/step_definitions/github-api-client_steps.rb
+- db/migrate/006_create_organizations_members.rb
+- features/fetching.feature
+- features/step_definitions/fetching_steps.rb
 - features/support/env.rb
 - gemspec.old.orig
 - github-api-client.gemspec
@@ -354,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2851051507290303259
+      hash: 664932785481870982
       segments: 
       - 0
       version: "0"

data/features/github-api-client.feature

@@ -1,13 +0,0 @@
-Feature: Fetching Objects
-  In order to fetch objects from GitHub
-  I just need to fire up few commands
-
-  Scenario: Fetching user information
-    Given I fetch user "schacon"
-    Then My local database should contain that record
-    And That record's "name" should be "Scott Chacon"
-  
-  Scenario: Fetching repo information
-    Given I fetch repo "mojombo/jekyll"
-    Then My local database should contain that record
-    And That record's "login" of the "owner" should be "mojombo"