github-api-client 0.1.2.2 → 0.1.2.4

data/db/migrate/003_create_repos.rb

@@ -14,7 +14,7 @@ class CreateRepos < ActiveRecord::Migration
         t.integer attr
       end
       
-      %w(has_downloads fork deleted locked has_wiki private open_issues has_issues).each do |attr|
+      %w(has_downloads b_fork deleted locked has_wiki private open_issues has_issues).each do |attr|
         t.boolean attr
       end
       

data/lib/github_api.rb

@@ -9,23 +9,8 @@ require 'yaml'
 require 'singleton'
 require 'active_record'
 require 'core_ext/habtm'
-
-# General placeholder for all of the GitHub API sweets
-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"}
-    
-    # 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)
-    end
-  end
-end
+require 'rainbow'
+require 'github_api/config'
 
 GitHub::Config.setup
 
@@ -33,22 +18,12 @@ require 'github_api/base'
 require 'github_api/user'
 require 'github_api/repo'
 require 'github_api/browser'
-require 'rainbow'
+
+unless $user = GitHub::User.where(GitHub::Config::Secrets).first
+  $user = GitHub::User.create(GitHub::Config::Secrets)
+end if GitHub::Config::Secrets
 
 
-begin
-  unless $user = GitHub::User.where(YAML::load_file(GitHub::Config::Path[:secrets])['user']).first
-    $user = GitHub::User.create(YAML::load_file(GitHub::Config::Path[:secrets])['user'])
-  end
-  
-rescue Errno::ENOENT
-  puts "Could not load config/secrets.yml, have you defined it?"
-  puts "Putting example secrets file in your #{GitHub::Config::Path[:secrets]}"
-  File.open(GitHub::Config::Path[:secrets], 'w') do |f|
-    f.write <<-config
-user:
- login: login
- token: private_token
-    config
-  end
+# General placeholder for all of the GitHub API sweets
+module GitHub
 end

data/lib/github_api/base.rb

@@ -37,15 +37,23 @@ module GitHub
     # @return [Hash] parsed attributes, fully compatibile with local db
     def self.parse_attributes(resource, attributes)
       hash = case resource
-    when :user_get then {:public_repo_count => :nil, :public_gist_count => :nil, :created => :nil, :permission => :nil, :followers_count => :nil, :following_count => :nil}
+        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 => :public_repo_count, :created => :nil, :permission => :nil}
-      when :repo then {:fork => :"fork?".to_s}
+        when :repo_get then {:fork => :b_fork}
       end
       hash.each do |k, v|
         unless v == :nil
-          attributes[v.to_s] = attributes[k.to_s]
+          if [:repo_get].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
+          attributes.delete k.to_sym
+        else
+          attributes.delete k.to_s
         end
-        attributes.delete k.to_s
       end
       attributes
     end

data/lib/github_api/config.rb

@@ -0,0 +1,34 @@
+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"} 
+    
+    # Secrets array, uses env vars if defined
+    Secrets = {"login" => ENV['GITHUB_USER'], "token" => ENV['GITHUB_TOKEN']} if ENV['GITHUB_USER'] && ENV['GITHUB_TOKEN']
+    begin
+      Secrets ||= YAML::load_file(GitHub::Config::Path[:secrets])['user']
+    rescue Errno::ENOENT
+      # Eye candy with rainbow
+      puts <<-report
+You have two ways of defining your user to have authenticated access to your API:
+  #{"1.".color(:cyan)} Put a file in: #{GitHub::Config::Path[:secrets].color(:blue).bright}
+    Define in yaml:
+      #{"user".color(:yellow).bright}:
+        #{"login".color(:green).bright}: #{"your_login".color(:magenta)}
+        #{"token".color(:blue).bright}: #{"your_token".color(:magenta)}
+  #{"2.".color(:cyan)} Put #{"GITHUB_USER".color(:green).bright} and #{"GITHUB_TOKEN".color(:blue).bright} in your environment, so github-api-client can read it.
+  
+      report
+    end
+    Secrets ||= nil
+    
+    # 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)
+    end
+  end
+end

data/lib/github_api/repo.rb

@@ -5,7 +5,9 @@ module GitHub
     
     def self.get(information)
       #FIXME: permalink column must be present, comparing url's is surely not the most efficient way for the db
-      GitHub::Repo.find_or_create_by_url(YAML::load(GitHub::Browser.get("/repos/show/#{information}"))['repository'])
+      GitHub::Repo.find_or_create_by_url(
+        GitHub::Base.parse_attributes(:repo_get,
+          YAML::load(GitHub::Browser.get("/repos/show/#{information}"))['repository']))
     end
     
     
@@ -27,5 +29,9 @@ module GitHub
     def permalink
       "#{owner.login}/#{name}"
     end
+    
+    define_method(:fork?) do
+      b_fork
+    end
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 2
-  - 2
-  version: 0.1.2.2
+  - 4
+  version: 0.1.2.4
 platform: ruby
 authors: 
 - "Jakub Oko\xC5\x84ski"
@@ -75,6 +75,7 @@ files:
 - lib/github_api/base.rb
 - lib/github_api/repo.rb
 - lib/github_api/browser.rb
+- lib/github_api/config.rb
 - lib/github_api/user.rb
 - db/migrate/003_create_repos.rb
 - db/migrate/002_create_followings.rb