smartystreets_ruby_sdk 4.0.1 → 4.1.3

data/Makefile

@@ -1,22 +1,20 @@
 #!/usr/bin/make -f
 
-SOURCE_VERSION := 4.0
-
 tests:
 	ruby -Ilib -e 'ARGV.each { |f| require f }' ./test/smartystreets_ruby_sdk/test*.rb ./test/smartystreets_ruby_sdk/us_street/test*.rb ./test/smartystreets_ruby_sdk/us_zipcode/test*.rb
 
-publish: version
-	git push origin --tags
+publish-patch:
+	@python tag.py patch
+	git describe
 	gem build smartystreets_ruby_sdk.gemspec
-	gem push smartystreets_ruby_sdk-$(shell git describe).gem
-	git checkout lib/smartystreets_ruby_sdk/version.rb
+	gem push smartystreets_ruby_sdk-`git describe`.gem
 
-version: tag
-	@sed -i -r "s/0\.0\.0/$(shell git describe)/g" lib/smartystreets_ruby_sdk/version.rb
+publish-minor:
+	@python tag.py minor
+	gem build smartystreets_ruby_sdk.gemspec
+	gem push smartystreets_ruby_sdk-$(shell git describe).gem
 
-tag:
-	$(eval PREFIX := $(SOURCE_VERSION).)
-	$(eval CURRENT := $(shell git describe 2>/dev/null))
-	$(eval EXPECTED := $(PREFIX)$(shell git tag -l "$(PREFIX)*" | wc -l | xargs expr -1 +))
-	$(eval INCREMENTED := $(PREFIX)$(shell git tag -l "$(PREFIX)*" | wc -l | xargs expr 0 +))
-	@if [ "$(CURRENT)" != "$(EXPECTED)" ]; then git tag -a "$(INCREMENTED)" -m "" 2>/dev/null || true; fi
+publish-major:
+	@python tag.py major
+	gem build smartystreets_ruby_sdk.gemspec
+	gem push smartystreets_ruby_sdk-$(shell git describe).gem

data/lib/smartystreets_ruby_sdk/international_street/metadata.rb

@@ -3,13 +3,14 @@ module SmartyStreets
     # See "https://smartystreets.com/docs/cloud/international-street-api#metadata"
     class Metadata
 
-      attr_reader :longitude, :geocode_precision, :max_geocode_precision, :latitude
+      attr_reader :longitude, :geocode_precision, :max_geocode_precision, :latitude, :address_format
 
       def initialize(obj)
         @latitude = obj.fetch('latitude', nil)
         @longitude = obj.fetch('longitude', nil)
         @geocode_precision = obj.fetch('geocode_precision', nil)
         @max_geocode_precision = obj.fetch('max_geocode_precision', nil)
+        @address_format = obj.fetch('address_format', nil)
       end
     end
   end

data/lib/smartystreets_ruby_sdk/version.rb

@@ -1,3 +1,3 @@
 module SmartyStreets
-  VERSION = '4.0.1' # DO NOT EDIT (this is updated by a build job when a new release is published)
+  VERSION = '4.1.3' # DO NOT EDIT (this is updated by a build job when a new release is published)
 end

data/tag.py

@@ -0,0 +1,53 @@
+import subprocess
+import sys
+
+INCREMENTS = {
+	"patch": 2,
+	"minor": 1,
+	"major": 0,
+}
+
+def main():
+	increment = sys.argv[-1]
+	if increment not in ['patch', 'minor', 'major']:
+		print 'Invalid INCREMENT value. Please use "patch", "minor", or "major".'
+		os.Exit(1)
+
+	increment = INCREMENTS[increment]
+
+	current = subprocess.check_output("git describe", shell=True).split()
+	last_stable = subprocess.check_output("git tag -l", shell=True).strip().split('\n')[-1]
+	if current == last_stable:
+		return
+
+	last_stable_split = last_stable.split('.')
+	last_stable_split[increment] = str(int(last_stable_split[increment]) + 1)
+
+	if increment == 0:
+		last_stable_split[1] = "0"
+		last_stable_split[2] = "0"
+
+	if increment == 1:
+		last_stable_split[2] = "0"
+
+	incremented = '.'.join(last_stable_split)
+	print incremented
+
+	replace_in_file('lib/smartystreets_ruby_sdk/version.rb', last_stable, incremented)
+
+	subprocess.check_call('git add lib/smartystreets_ruby_sdk/version.rb', shell=True)
+	subprocess.check_call('git commit -m "Incremented version number to {0}"'.format(incremented), shell=True)
+	subprocess.check_call('git tag -a {0} -m "{0}"'.format(incremented), shell=True)
+	subprocess.check_call('git push origin master --tags', shell=True)
+
+
+def replace_in_file(filename, search, replace):
+	with open(filename) as source:
+		updated = source.read().replace(search, replace)
+
+	with open(filename, 'w') as update:
+		update.write(updated)
+
+
+if __name__ == '__main__':
+	main()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartystreets_ruby_sdk
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -161,6 +161,7 @@ files:
 - lib/smartystreets_ruby_sdk/version.rb
 - ruby-sdk-demo.json
 - smartystreets_ruby_sdk.gemspec
+- tag.py
 homepage: https://github.com/smartystreets/smartystreets-ruby-sdk
 licenses:
 - Apache-2.0