gpig 0.0.2 → 0.0.4

data/bin/gpig

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'gpig/version'
+require 'trollop'
+require 'yaml'
+
 def increment_version(vfile)
   str = File.open(vfile).read
   str.gsub!(/\r\n?/, "\n")
@@ -17,39 +21,37 @@ def increment_version(vfile)
   File.open(vfile, 'w') { |file| file.write(str2) }
 end
 
-class PigConfig
-  def self.vfile=(str)
-    @@vfile = str
-  end
-  def self.vfile
-    return @@vfile
-  end
-  def self.repo=(str)
-    @@repo = str
-  end
-  def self.repo
-    return @@repo
-  end
+opts = Trollop::options do
+#  version "gpig version #{Gpig::VERSION}\n"
+  banner <<-EOS
+--------------------------------------------------------------------------------  
+GPIG (Git Push Install Gem)
+Gpig is a nice little tool to help speed up gem development.  It allows you 
+to make a change in your gem code, then quickly increment the version of 
+the gem code, push changes to a git repository, and install the new version 
+of the gem locally so you can test it.
+--------------------------------------------------------------------------------
+EOS
+  version "gpig Version #{Gpig::VERSION}\n"
+  opt :conf_file      , "The configuration file.", :type => :string, :default => File.join(Dir.pwd,'.gpig')
+  opt :increment      , "Whether or not to increment the version.", :default => true
+  opt :version_file   , "The version file that holds the VERSION variable that will be incremented.", :type => :string
+  opt :repo_url       , "The URL of the git repo from which the new gem will be installed.", :type => :string
+  opt :remote         , "The remote to which the local code changes will be pushed.", :type => :string, :default => 'origin'
+  opt :branch         , "The branch to which the local code changes will be committed." , :type => :string, :default => 'master'
+  opt :commit_message , "The message when committing files to the repo.", :type => :string, :default => "More changes"
 end
 
-#===============================================================================
-
-PigConfig.vfile = ARGV.count > 0 ? ARGV[0] : false
-PigConfig.repo  = ARGV.count > 1 ? ARGV[1] : false
-
-if (ARGV.count == 0 && File.exists?(File.join(Dir.pwd, '.gpig')))
-  load File.join(Dir.pwd, '.gpig')
+conf = YAML::load_file(opts.conf_file)
+conf.each do |key,val|
+  opts[key.to_sym] = val
 end
 
-vfile = PigConfig.vfile
-repo  = PigConfig.repo
-
-if (!vfile || !repo || vfile.strip.length == 0 || repo.strip.length == 0)  
-  puts "Usage: gpig <version_file> <git_repo_url>\n\n"
-  puts "       or have a .gpig config file with those arguments on the first line."
+if (!opts.version_file || !opts.repo_url || opts.version_file.strip.length == 0 || opts.repo_url.strip.length == 0)
+  opts.help  
   exit 
-elsif (!File.exists?(vfile))
-  puts "Error: the version file (#{vfile}) doesn't seem to exist.\n";
+elsif (!File.exists?(opts.version_file))
+  puts "Error: the version file (#{opts.version_file}) doesn't seem to exist.\n";
   exit
 end
 
@@ -59,16 +61,24 @@ if (!str.index('nothing to commit').nil?)
   exit
 end
 
-puts "Modifying the version..."
-increment_version(vfile)
-puts "Adding files to git repo..."
+if (opts.increment)
+  puts "\nModifying the version..."
+  increment_version(opts.version_file)
+end
+
+puts "\nAdding files to git repo..."
 `git add -A`
-puts "Committing files to git repo..."
-`git commit -m 'More changes'`
-puts "Pulling in any changes..."
-`git pull origin master`
-puts "Pushing in any changes..."
-`git push origin master`
-puts "Installing new version of gem..."
-`gem specific_install -l #{repo}`
-puts "Finished!\n\n"
+
+puts "\nCommitting files to git repo..."
+`git commit -m "#{opts.commit_message}"`
+
+puts "\nPulling in any changes..."
+`git pull #{opts.remote} #{opts.branch}`
+
+puts "\nPushing in any changes..."
+`git push #{opts.remote} #{opts.branch}`
+
+puts "\nInstalling new version of gem..."
+`gem specific_install -l #{opts.repo_url}`
+
+puts "\nFinished!\n\n"

data/lib/gpig.rb

@@ -1,4 +1,5 @@
-require "gpig/engine"
+
+require "gpig/version"
 
 module Gpig
 end

data/lib/gpig/version.rb

@@ -1,3 +1,3 @@
 module Gpig
-  VERSION = "0.0.2"
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: specific_install
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  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: A tool to quickly add files to a git repo, push, and then use specific_install
   to install the new gem.
 email:
@@ -37,7 +53,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/gpig
-- lib/gpig/engine.rb
 - lib/gpig/version.rb
 - lib/gpig.rb
 - MIT-LICENSE

data/lib/gpig/engine.rb

@@ -1,5 +0,0 @@
-
-module Gpig
-  class Engine < ::Rails::Engine
-  end
-end