github-api-client 0.2.1.2 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    github-api-client (0.2.1)
+    github-api-client (0.2.2)
       activerecord (>= 3.0.3)
       activerecord (>= 3.0.3)
       activesupport (>= 3.0.3)

data/VERSION

@@ -1 +1 @@
-0.2.1.2
+0.2.2

data/api-browser.rb

@@ -3,12 +3,11 @@ $:.unshift('./lib/')
 
 require 'github-api-client'
 
-GitHub::Config::Options[:verbose] = true if ARGV.include? '--verbose'
+puts GitHub::Config::Version
 
 unless ARGV.include? 'test'
   # Dev temporary code here
-  #GitHub::Repo.get('parndt/hub').parent.fetch(:self, :watchers).watchers
-  GitHub::User.get('schacon').fetch(:self, :followers, :followings)
+  p GitHub::Organization.get('github')
 else # launches all-features code
   # Performance tests
   GitHub::Repo.get('mojombo/jekyll').fetch(:self, :watchers)

data/db/migrate/001_create_users.rb

@@ -1,6 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
   def self.up
-    create_table :users, :force => true do |t|
+    create_table :users do |t|
       %w(login token type name company location blog email language permission).each do |attr|
         t.string attr
       end

data/db/migrate/002_create_user_followings.rb

@@ -1,6 +1,6 @@
 class CreateUserFollowings < ActiveRecord::Migration
   def self.up
-    create_table :user_followings, :id => false, :force => true do |t|
+    create_table :user_followings, :id => false do |t|
       t.references :follower
       t.references :following
     end

data/db/migrate/003_create_repos.rb

@@ -1,6 +1,6 @@
 class CreateRepos < ActiveRecord::Migration
   def self.up
-    create_table :repos, :force => true do |t|
+    create_table :repos do |t|
       %w(name description url language integrate_branch homepage source).each do |attr|
         t.string attr
       end

data/db/migrate/004_create_repo_watchings.rb

@@ -1,6 +1,6 @@
 class CreateRepoWatchings < ActiveRecord::Migration
   def self.up
-    create_table :repo_watchings, :id => false, :force => true do |t|
+    create_table :repo_watchings, :id => false do |t|
       t.references :watcher
       t.references :repo
     end

data/db/migrate/005_create_organizations.rb

@@ -0,0 +1,15 @@
+class CreateOrganizations < ActiveRecord::Migration
+  def self.up
+    create_table :organizations do |t|
+      %w(name company location blog type login email gravatar_id billing_email permission).each do |attr|
+        t.string attr
+      end
+      
+      t.timestamps
+    end
+  end
+  
+  def self.down
+    drop_table :organizations
+  end
+end

data/github-api-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{github-api-client}
-  s.version = "0.2.1.2"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Okoński"]
-  s.date = %q{2010-12-22}
+  s.date = %q{2010-12-23}
   s.description = %q{Caches retrieved information to your user profile and reuses it when you query again.}
   s.email = %q{kuba@okonski.org}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "db/migrate/002_create_user_followings.rb",
     "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",
     "features/support/env.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
     "lib/github-api-client/base.rb",
     "lib/github-api-client/browser.rb",
     "lib/github-api-client/config.rb",
+    "lib/github-api-client/organization.rb",
     "lib/github-api-client/repo.rb",
     "lib/github-api-client/user.rb",
     "spec/github-api-client_spec.rb",

data/lib/github-api-client.rb

@@ -15,11 +15,18 @@ require 'core_ext/habtm'
 require 'rainbow'
 require 'github-api-client/config'
 
-GitHub::Config.setup
+# This hard-coded if's will be soon replaced by Option Parser
+GitHub::Config::Options[:verbose] = true if ARGV.include? '--verbose'
+if ARGV.include? '--reset-db'
+  GitHub::Config.reset
+else
+  GitHub::Config.setup
+end
 
 require 'github-api-client/base'
 require 'github-api-client/user'
 require 'github-api-client/repo'
+require 'github-api-client/organization'
 require 'github-api-client/browser'
 
 unless $user = GitHub::User.where(GitHub::Config::Secrets).first

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

@@ -46,16 +46,19 @@ module GitHub
         when :user_get then {:public_repo_count => :nil, :public_gist_count => :nil, :created => :nil, :permission => :nil, :followers_count => :nil, :following_count => :nil}
         when :user_search then {:name => :login, :username => :login, :fullname => :name, :followers => :nil, :repos => :nil, :created => :nil, :permission => :nil}
         when :repo_get then {:fork => :b_fork, :watchers => :nil}
+        when :org_get then {:public_gist_count => nil, :public_repo_count => nil, :following_count => :nil, :followers_count => :nil}
       end
+      # Provides abstraction layer between YAML :keys and 'keys' returned by Hub
+      symbolized_resources = [:repo_get]
       hash.each do |k, v|
-        unless v == :nil
-          if [:repo_get].include? resource
+        unless v == :nil || v == nil
+          if symbolized_resources.include? resource
             attributes[v.to_s] = attributes[k.to_sym]
           else
             attributes[v.to_s] = attributes[k.to_s]
           end
         end
-        if [:repo_get].include? resource
+        if symbolized_resources.include? resource
           attributes.delete k.to_sym
         else
           attributes.delete k.to_s

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

@@ -2,18 +2,26 @@ module GitHub
   # Keeps all the configuration stuff
   module Config
     # Constant with defined all the paths used in the application
-    Path = {:dir => ENV['HOME'] + "/.github", :dbfile => ENV['HOME'] + "/.github/github.db", :migrations => Gem.loaded_specs['github-api-client'].full_gem_path +  "/db/migrate", :secrets => ENV['HOME'] + "/.github" + "/secrets.yml"} 
+    Path = {
+      :dir        => ENV['HOME'] + "/.github", 
+      :dbfile     => ENV['HOME'] + "/.github/github.db", 
+      :migrations => Gem.loaded_specs['github-api-client'].full_gem_path +  "/db/migrate", 
+      :secrets    => ENV['HOME'] + "/.github" + "/secrets.yml"
+    } 
     
-    if Dir.pwd != Gem.loaded_specs['github-api-client'].full_gem_path
-      Version = File.read(Gem.loaded_specs['github-api-client'].full_gem_path + "/VERSION")
-    else
-      Version = File.read(Dir.pwd + "/VERSION")
-    end
+    Version = File.read(
+      Gem.loaded_specs['github-api-client'].full_gem_path + "/VERSION"
+    )
     VERSION = Version
     
     # Secrets array, uses env vars if defined
-    Secrets = {"login" => ENV['GITHUB_USER'], "token" => ENV['GITHUB_TOKEN']} if ENV['GITHUB_USER'] && ENV['GITHUB_TOKEN']
+    Secrets = {
+      "login" => ENV['GITHUB_USER'], 
+      "token" => ENV['GITHUB_TOKEN']
+    } if ENV['GITHUB_USER'] && ENV['GITHUB_TOKEN']
+    
     begin
+      # If not env vars, then ~/.github/secrets.yml
       Secrets ||= YAML::load_file(GitHub::Config::Path[:secrets])['user']
     rescue Errno::ENOENT
       # Eye candy with rainbow
@@ -28,16 +36,30 @@ You have two ways of defining your user to have authenticated access to your API
   
       report
     end
+    
     Secrets ||= nil
     
-    Options = {:verbose => false}
+    Options = {
+      :verbose => false
+    }
     
     # Sets up the database and migrates it
     # @return [nil]
     def self.setup
       Dir.mkdir GitHub::Config::Path[:dir] rescue nil
-      ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => GitHub::Config::Path[:dbfile]
-      ActiveRecord::Migrator.migrate(GitHub::Config::Path[:migrations], nil) if not File.exists? GitHub::Config::Path[:dbfile]
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'sqlite3', 
+        :database => GitHub::Config::Path[:dbfile]
+      )
+      ActiveRecord::Migrator.migrate(
+        GitHub::Config::Path[:migrations], 
+        nil
+      ) if not File.exists? GitHub::Config::Path[:dbfile]
+    end
+    
+    def self.reset
+      system "rm #{Path[:dbfile]}"
+      setup
     end
   end
 end

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

@@ -0,0 +1,16 @@
+module GitHub
+  class Organization < ActiveRecord::Base
+    def get
+      self.update_attributes(
+        GitHub::Base.parse_attributes(:org_get,
+          YAML::load(
+            GitHub::Browser.get("/organizations/#{self.login}"))['organization']))
+      self
+    end
+    
+    def self.get(login)
+      o   = GitHub::Organization.find_by_login(login)
+      o ||= GitHub::Organization.new(:login => login).get
+    end
+  end
+end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
   - 2
-  version: 0.2.1.2
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Jakub Oko\xC5\x84ski"
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2010-12-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -325,6 +324,7 @@ files:
 - db/migrate/002_create_user_followings.rb
 - 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
 - features/support/env.rb
@@ -335,6 +335,7 @@ files:
 - lib/github-api-client/base.rb
 - lib/github-api-client/browser.rb
 - lib/github-api-client/config.rb
+- lib/github-api-client/organization.rb
 - lib/github-api-client/repo.rb
 - lib/github-api-client/user.rb
 - spec/github-api-client_spec.rb
@@ -353,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4447354938044863617
+      hash: 2851051507290303259
       segments: 
       - 0
       version: "0"