git-flattr 0.0.3 → 0.0.9

data/bin/git-flattr

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 $:.push File.expand_path("../../lib", __FILE__)
-require 'version'
-require 'flattr'
-require 'launchy'
+
+require 'git-flattr'
 require 'commander/import'
 
 program :name, "git flattr"
@@ -11,114 +10,11 @@ program :version, VERSION
 program :help, 'Author', 'Simon Gate <simon@smgt.me>'
 default_command :help
 
-def error message
-  puts "Error: #{message}"
-end
-
-class Git
-  class <<self
-    def command cmd, opts = []
-      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
-      git_cmd = "git #{cmd} #{opts} 2>&1"
-      `#{git_cmd}`.chomp
-    end
-
-    def escape(s)
-      escaped = s.to_s.gsub('\'', '\'\\\'\'')
-      %Q{"#{escaped}"}
-    end
-
-    def config name
-      command('config', ['--get', name])
-    end
-
-    def set_config name, value
-      command('config', ['--global', '--add', name, value])
-    end
-
-    def github_repository?
-      origin = config 'remote.origin.url'
-      !origin.match(%r{^(https://[a-z0-9\-_]+@github\.com|git@github\.com:|https://github\.com/)}).nil?
-    end
-
-    def github_url
-      origin = config 'remote.origin.url'
-      if @github_url.nil?
-        if origin.match %r{^https://[a-zA-Z0-9\-_]+@github\.com}
-          match = origin.match(%r{^https://[a-zA-Z0-9\-_]+@github\.com/([a-zA-Z0-9\-_]+)/([a-zA-Z0-9\-_]+)\.git$})
-        elsif origin.match %r{^git@github.com:}
-          match = origin.match(%r{^git@github\.com:([a-zA-Z0-9\-_]+)/([a-zA-Z0-9\-_]+)\.git$})
-        elsif origin.match %r{^https://github\.com/}
-          match = origin.match(%r{^https://github\.com/([a-zA-Z0-9\-_]+)/([a-zA-Z0-9\-_]+)\.git$})
-        end
-        if match.nil?
-          error "Parsing GitHub origin."
-          exit 1
-        else
-          @github_url = "https://github.com/#{match[1]}/#{match[2]}"
-        end
-      end
-      return @github_url
-    end
-
-    def valid?
-
-      git_opts = {
-        :dir    => "#{Dir.pwd}/.git",
-        :config => "#{Dir.pwd}/.git/config"
-      }
-
-      unless File.exists?(git_opts[:dir])
-        error "Don't seem to be a git repository"
-        exit 1
-      end
-
-      unless File.exists?(git_opts[:config])
-        error "Git .config file not found"
-        exit 1
-      end
-
-      unless Git.github_repository?
-        error "Not a GitHub repository"
-        exit 1
-      end
-    end
-  end
-end
-
-module Auth
-  class <<self
-    def is_authed?
-      Git.config('flattr.token') != ""
-    end
-
-    def do!
-      begin
-        Launchy.open("https://git-flattr.herokuapp.com/")
-        token = ask("Token: ")
-      rescue Exception => e
-        puts e.message
-        puts "Seems like you are missing a Flattr access token."
-        puts "Browse to http://git-flattr.herokuapp.com and follow the instructions"
-        token = ask("Token: ")
-      end
-      if token.nil?
-        error "Invalid access token"
-        exit 1
-      end
-
-      Git.set_config "flattr.token", token.chomp
-    end
-  end
-end
-
 Flattr.configure do |config|
   config.access_token = Git.config 'flattr.token'
 end
 
 command :repo do |c|
-
-
   c.syntax = "git flattr repo"
   c.description = "Flattr the repository"
   c.action do |args, options|
@@ -138,10 +34,8 @@ command :repo do |c|
 
     rescue Flattr::Error::Unauthorized => e
       error e.message
-      exit 1
     rescue Flattr::Error::Forbidden => e
       error e.message
-      exit 1
     end
   end
 end
@@ -158,6 +52,44 @@ command :commit do |c|
       end
 
       ARGV.shift
+
+      commit = ARGV.shift
+      if commit.nil?
+        error "No commit supplied"
+      end
+
+      commit = Git.commit commit
+
+      if !commit
+        error "Commit does not exist in this repository"
+      end
+
+      commit_url = "#{Git.github_url}/commit/#{commit}"
+      flattr = Flattr.new
+      puts commit_url
+      flattr.flattr commit_url
+      thing = flattr.thing_lookup Git.github_url
+      puts "Flattred #{Git.github_url} (#{thing.link})!"
+      exit 0
+    rescue Flattr::Error::Unauthorized => e
+      error e.message
+    rescue Flattr::Error::Forbidden => e
+      error e.message
+    end
+  end
+end
+
+command :info do |c|
+  c.syntax = "git flattr info"
+  c.description = "Information about the current repository"
+  c.action do |args, opts|
+    Git.valid?
+    flattr = Flattr.new
+    thing = flattr.thing_lookup Git.github_url
+    if thing
+      puts "[#{thing.flattrs}] flattrs, #{thing.title} ( #{thing.url} )"
+    else
+      puts "This GitHub repo is not on Flattr."
     end
   end
 end

data/lib/git-flattr.rb

@@ -0,0 +1,119 @@
+require 'version'
+require 'flattr'
+require 'launchy'
+
+def error message
+  puts "Error: #{message}"
+  exit 1
+end
+
+class Git
+  class <<self
+    def command cmd, opts = []
+      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
+      git_cmd = "git #{cmd} #{opts} 2>&1"
+      result = `#{git_cmd}`.chomp
+      if $?.to_i == 0
+        return result
+      else
+        return false
+      end
+    end
+
+    def escape(s)
+      escaped = s.to_s.gsub('\'', '\'\\\'\'')
+      %Q{"#{escaped}"}
+    end
+
+    def config name
+      command('config', ['--get', name])
+    end
+
+    def set_config name, value
+      command('config', ['--global', '--add', name, value])
+    end
+
+    def current_repo_github?
+      origin = config 'remote.origin.url'
+      github_repo? origin
+    end
+
+    def commit sha
+      #git log -1 --format=%H 53bebbe
+      command("log", ["-1", "--format=%H", sha])
+    end
+
+    def github_url
+      origin = config 'remote.origin.url'
+      if github_repo? origin
+        return @github_url
+      end
+    end
+
+    def github_repo? url
+
+      if url.match %r{^https://[\w-]+@github\.com}
+        match = url.match(%r{^https://[\w-]+@github\.com/([\w-]+)/([\w-.]+)\.git$})
+      elsif url.match %r{^git@github\.com:}
+        match = url.match(%r{^git@github\.com:([\w-]+)/([\w-.]+)\.git$})
+      elsif url.match %r{^git://github\.com/}
+        match = url.match(%r{^git://github\.com/([\w-]+)/([\w-.]+)\.git$})
+      elsif url.match %r{^https://github\.com/}
+        match = url.match(%r{^https://github\.com/([\w-]+)/([\w-.]+)\.git$})
+      end
+
+      if !match.nil?
+        @github_url = "https://github.com/#{match[1]}/#{match[2]}"
+        return true
+      else
+        @github_url = nil
+        return false
+      end
+    end
+
+    def valid?
+
+      git_opts = {
+        :dir    => "#{Dir.pwd}/.git",
+        :config => "#{Dir.pwd}/.git/config"
+      }
+
+      unless File.exists?(git_opts[:dir])
+        error "Don't seem to be a git repository"
+      end
+
+      unless File.exists?(git_opts[:config])
+        error "Git .config file not found"
+      end
+
+      unless Git.current_repo_github?
+        error "Not a GitHub repository"
+      end
+    end
+  end
+end
+
+module Auth
+  class <<self
+    def is_authed?
+      Git.config('flattr.token') != ""
+    end
+
+    def do!
+      begin
+        Launchy.open("https://git-flattr.herokuapp.com/")
+        token = ask("Token: ")
+      rescue Exception => e
+        puts e.message
+        puts "Seems like you are missing a Flattr access token."
+        puts "Browse to http://git-flattr.herokuapp.com and follow the instructions"
+        token = ask("Token: ")
+      end
+      if token.nil?
+        error "Invalid access token"
+      end
+
+      Git.set_config "flattr.token", token.chomp
+    end
+  end
+end

data/lib/version.rb

@@ -1 +1 @@
-VERSION="0.0.3"
+VERSION="0.0.9"

data/spec/git_spec.rb

@@ -0,0 +1,26 @@
+$:.push File.expand_path("../../lib", __FILE__)
+require "git-flattr"
+
+github_urls = [
+  "git@github.com:kallux/5defence.git",
+  "https://simon@github.com/kallux/5defence.git",
+  "git://github.com/kallux/5defence.git",
+  "git@github.com:simon/git-flattr.git",
+  "https://simon@github.com/simon/git-flattr.git",
+  "git://github.com/simon/git-flattr.git",
+  "https://github.com/voxpelli/jquery-alterbyobject.git",
+  "git://github.com/voxpelli/jquery-alterbyobject.git",
+  "git@github.com:simon/colorful_json.git",
+  "https://simon@github.com/simon/colorful_json.git",
+  "git://github.com/simon/colorful_json.git",
+  "https://github.com/Ask11/backbone.offline.git",
+  "git://github.com/Ask11/backbone.offline.git"
+]
+
+describe Git, '#github_repo?' do
+  it "returns true for all github urls" do
+    github_urls.each { |url|
+      Git.github_repo?(url).should be_true
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-flattr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flattr
@@ -74,7 +74,9 @@ files:
 - Rakefile
 - bin/git-flattr
 - git-flattr.gemspec
+- lib/git-flattr.rb
 - lib/version.rb
+- spec/git_spec.rb
 homepage: 
 licenses: []
 post_install_message: 
@@ -99,4 +101,5 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Flattr GitHub repositories from the cli
-test_files: []
+test_files:
+- spec/git_spec.rb