versionate 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31d4b61429a3510f9670c7fac0867ba74174a3c
-  data.tar.gz: 1b41cf0a17ae9ab03eaba0fce88e3a0a69421904
+  metadata.gz: 94e6a72320c0db01b6e702717d6de8d645203dfd
+  data.tar.gz: cef7b4f819ac70cf7b2b12ed661a0cb9d160ba3f
 SHA512:
-  metadata.gz: 1aaaf9ed9a1ab60625a880849fc1d34ddcee77305fc22d01cf8787a8515678391e130ca40f1db1c0f26de287044ead3f631dd4c2625b62e85229ac885c0e72b2
-  data.tar.gz: 288d298676254781fe08350bb7a4d971567422c2ee243a811214307a81a164f9aa73e2dbb18c0ca3d80acceb6ed852b005227dce5dfcaff61c507ed0789b2107
+  metadata.gz: 2325185701938205d5ae1833b70e35980b55c265627b7cacefade5eec66429fc2cc087897ed28a55a7a43360c0089968382e6020c40759fb3d91b95700df40fe
+  data.tar.gz: ed9468e6b9564db667f74436ab68ba1fcfc28988eb9b712c413fbd98af99c7e2d91774c37cc8615da2d02ad1d46e07b3e7d52c34986aa885ec5b2e1686c69da4

data/README.md

@@ -16,8 +16,57 @@ $ versionate
 ```
 
 If, for some odd reason, your Gemfile is called something other than “Gemfile”,
-you can specify the name as an argument to the command, like this:
+you can specify the name as an argument to the sub-command `version`, like this:
 
 ```bash
-$ versionate file_with_gems.rb
+$ versionate version file_with_gems.rb
+```
+
+### Options
+
+You can tweak the output of versionate by passing in some options to the
+command. First off, it's simple to strip off the patch versions in the resulting
+versions by passing in the `--no-patch` flag:
+
+```bash
+$ versionate --no-patch
+```
+
+Prepending a version specifier to the version is simple as well, just pass it in
+to the `--specifier` option:
+
+```bash
+$ versionate --specifier="~>"
+```
+
+Of course, this also works when using the more verbose syntax:
+
+```bash
+$ versionate version --no-patch --specifier="~>" Gemfile
+```
+
+### Getting help
+
+If you find yourself forgetting commands and/or options the `help` sub-command
+is always available for you:
+
+```bash
+$ versionate help
+Commands:
+  versionate help [COMMAND]      # Describe available commands or one specific command
+  versionate process [FILENAME]  # Processes a given file (default: Gemfile)
+```
+
+You can also ask for help on specific sub-command:
+
+```bash
+$ versionate help process
+Usage:
+  versionate process [FILENAME]
+
+Options:
+  [--patch], [--no-patch]  # Whether or not to keep patch version (default: true)
+  [--specifier=SPECIFIER]  # Specifier to be prepended to version
+
+Processes a given file (default: Gemfile)
 ```

data/bin/versionate

@@ -1,9 +1,5 @@
 #! /usr/bin/env ruby
 
-require "versionate"
+require "versionate/cli"
 
-if ARGV.any?
-  Versionate.versionate ARGV.first
-else
-  Versionate.versionate
-end
+Versionate::CLI.start ARGV

data/lib/versionate/cli.rb

@@ -0,0 +1,31 @@
+require "thor"
+
+require "versionate"
+
+module Versionate
+  class CLI < Thor
+    DEFAULT_GEMFILE_NAME = "Gemfile"
+
+    desc "process [FILENAME]", "Processes a given file (default: Gemfile)"
+
+    option :patch,
+      type: :boolean,
+      desc: "Whether or not to keep patch version (default: true)"
+
+    option :specifier,
+      type: :string,
+      desc: "Specifier to be prepended to version"
+    def process(file = DEFAULT_GEMFILE_NAME)
+      Versionate.versionate file, options
+    end
+
+    desc "version", "Display the version of versionate"
+
+    def version
+      puts Versionate::VERSION
+    end
+
+    default_task :process
+
+  end
+end

data/lib/versionate/version.rb

@@ -1,3 +1,3 @@
 module Versionate
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/versionate/versioner.rb

@@ -1,9 +1,10 @@
 module Versionate
   class Versioner
-    GEM_REGEXP = /^\s*gem ['"](?<name>.+?)['"](?<extra>,.+$?)?/
+    GEM_REGEXP     = /^\s*gem ['"](?<name>.+?)['"](?<extra>,.+$?)?/
+    VERSION_REGEXP = /^(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)/
 
-    def versionate(filename)
-      result = process filename
+    def versionate(filename, options = {})
+      result = process filename, options
 
       File.open filename, "w" do |file|
         file.write result
@@ -14,7 +15,10 @@ module Versionate
       provider.info(gem_name.to_sym)["version"]
     end
 
-    def process(filename)
+    def process(filename, options = {})
+      patch     = options.fetch("patch", true)
+      specifier = options["specifier"]
+
       orig_file = File.open(filename)
       tmp = StringIO.new
         
@@ -23,6 +27,10 @@ module Versionate
 
         if gem_name
           version = latest_version_for gem_name
+
+          version = remove_patch_version version unless patch
+          version = with_specifier(specifier, version) if specifier
+
           tmp.puts "#{line.chomp}, '#{version}'"
         else
           tmp.puts line
@@ -52,5 +60,15 @@ module Versionate
     def provider
       @provider ||= ApiAdapter.new.provider
     end
+
+    def remove_patch_version(version)
+      version.match VERSION_REGEXP do |match|
+        [ match[:major], match[:minor] ].join "."
+      end
+    end
+
+    def with_specifier(specifier, version)
+      "#{specifier} #{version}"
+    end
   end
 end

data/lib/versionate.rb

@@ -7,8 +7,8 @@ module Versionate
 
   class << self
 
-    def versionate gemfile = "Gemfile"
-      versioner.versionate gemfile
+    def versionate(gemfile, options)
+      versioner.versionate gemfile, options
     end
 
     def configure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: versionate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sindre Moen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,7 @@ files:
 - bin/versionate
 - lib/versionate.rb
 - lib/versionate/api_adapter.rb
+- lib/versionate/cli.rb
 - lib/versionate/configuration.rb
 - lib/versionate/version.rb
 - lib/versionate/versioner.rb