git-flattr 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    git-flattr (0.0.1)
+    git-flattr (0.0.2)
+      commander
       flattr
       launchy
 
@@ -9,11 +10,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
+    commander (4.1.2)
+      highline (~> 1.6.11)
     faraday (0.8.0)
       multipart-post (~> 1.1)
     flattr (0.3.5)
       faraday (~> 0.7)
       multi_json (~> 1.0)
+    highline (1.6.11)
     launchy (2.1.0)
       addressable (~> 2.2.6)
     multi_json (1.3.4)

data/README.md

@@ -1,4 +1,4 @@
 git-flattr
 ==========
 
-This is a gem that makes it easy to Flattr GitHub repositories from the command line. It's still in early development.
+This is a gem that makes it easy to Flattr GitHub repositories and commits from the command line. It's still in early development and currently you can only flattr repositories.

data/bin/git-flattr

@@ -1,12 +1,15 @@
 #!/usr/bin/env ruby
-
+$:.push File.expand_path("../../lib", __FILE__)
+require 'version'
 require 'flattr'
 require 'launchy'
+require 'commander/import'
 
-options = {
-  :git_dir => "#{Dir.pwd}/.git",
-  :git_config => "#{Dir.pwd}/.git/config"
-}
+program :name, "git flattr"
+program :description, "Easily flattr GitHub repositories from the CLI"
+program :version, VERSION
+program :help, 'Author', 'Simon Gate <simon@smgt.me>'
+default_command :help
 
 def error message
   puts "Error: #{message}"
@@ -57,59 +60,104 @@ class Git
       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
 
-begin
+module Auth
+  class <<self
+    def is_authed?
+      Git.config('flattr.token') != ""
+    end
 
-  unless File.exists?(options[:git_dir])
-    error "Don't seem to be a git repository"
-    exit 1
-  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
 
-  unless File.exists?(options[:git_config])
-    error "Git .config file not found"
-    exit 1
+      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|
 
-  unless Git.github_repository?
-    error "Not a GitHub repository"
-    exit 1
-  end
 
-  if Git.config('flattr.token') == ""
+  c.syntax = "git flattr repo"
+  c.description = "Flattr the repository"
+  c.action do |args, options|
     begin
-      Launchy.open("https://git-flattr.herokuapp.com/")
-      puts "Token: "
-      token = gets
-    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"
-      print "Token: "
-      token = gets
-    end
-    if token.nil?
-      error "Invalid access token"
+
+      Git.valid?
+
+      if !Auth.is_authed?
+        Auth.do!
+      end
+
+      flattr = Flattr.new
+      flattr.flattr Git.github_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
+      exit 1
+    rescue Flattr::Error::Forbidden => e
+      error e.message
       exit 1
     end
-    Git.set_config "flattr.token", token.chomp
   end
+end
 
-  Flattr.configure do |config|
-    config.access_token = Git.config 'flattr.token'
-  end
+command :commit do |c|
+  c.syntax = "git flattr commit [commit]"
+  c.description = "Flattr a commit"
+  c.action do |args, opts|
+    begin
+      Git.valid?
 
-  flattr = Flattr.new
-  flattr.flattr Git.github_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
-  exit 1
-rescue Flattr::Error::Forbidden => e
-  error e.message
-  exit 1
+      if !Auth.is_authed?
+        Auth.do!
+      end
+
+      ARGV.shift
+    end
+  end
 end

data/git-flattr.gemspec

@@ -1,8 +1,10 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib/", __FILE__)
+require "version"
 
 Gem::Specification.new do |s|
   s.name                            = 'git-flattr'
-  s.version                         = '0.0.2'
+  s.version                         = VERSION
   s.authors                         = ['Simon Gate']
   s.email                           = ['simon@smgt.me']
   s.summary                         = %q{Flattr GitHub repositories from the cli}
@@ -13,4 +15,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "flattr"
   s.add_runtime_dependency "launchy"
+  s.add_runtime_dependency "commander"
 end

data/lib/version.rb

@@ -0,0 +1 @@
+VERSION="0.0.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-flattr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flattr
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - simon@smgt.me
@@ -58,6 +74,7 @@ files:
 - Rakefile
 - bin/git-flattr
 - git-flattr.gemspec
+- lib/version.rb
 homepage: 
 licenses: []
 post_install_message: