flash_flow 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e0ad4e0bdac4c870699435930fec56da8d1e6f
-  data.tar.gz: 81f782e7022f09c4814f6488f387767df0c7e042
+  metadata.gz: c9e6ab87ca9801e4629eeb09aa913478f1f79888
+  data.tar.gz: 7a6b1a46d93592d3a3a30e4aa8b265adc964db7f
 SHA512:
-  metadata.gz: 7e7c38d6703b872e27d45202122a2e747a1fa9aca61ae80937c78cea2b932dee0587eaa963b8a09ac3a986f70aca121c6142970b67808c6bfbb335afddadc480
-  data.tar.gz: f83076ce192c2bb9987c883e10a6ea1e91be261bfc6c7b6b1f5cf78c3ad9b14433bd25a849ec5412a6ee70e7e9dfff9613ac4743f37ed84d7f443222fe2b7d9a
+  metadata.gz: 54e395f55d85b3bfcfb431c8695a95d5c7a22df811ba13af8ca073a88ab99de269790daa2d11c020a930131b50f2cc712d19149c0f4d3f639279de5805628829
+  data.tar.gz: 5e3af873561db5af9410b4615f2d7f34b6ebd37eb160fa88903c9fa82588ce24adbfcc1697a68ad1d70e058e053e66ac09209ed2691c4fae64e85ef3596e70e0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.1.2)
-      hipchat
-      octokit
-      pivotal-tracker
+    flash_flow (1.2.0)
+      hipchat (~> 1.5)
+      octokit (~> 4.1)
+      pivotal-tracker (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -39,7 +39,7 @@ GEM
     minitest-stub_any_instance (1.0.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    netrc (0.10.3)
+    netrc (0.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogiri-happymapper (0.5.9)
@@ -71,11 +71,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.6)
-  byebug
+  byebug (> 0)
   flash_flow!
-  minitest
-  minitest-stub_any_instance
-  rake
+  minitest (> 0)
+  minitest-stub_any_instance (> 0)
+  rake (> 0)
 
 BUNDLED WITH
    1.10.6

data/README.md

@@ -89,6 +89,9 @@ to which the message will be sent.
 
 ### Runtime options
 
+#### -v, --version
+Print the current version of flash flow and exit.
+
 #### -n, --no-merge
 Runs flash_flow, but excludes the branch that you're on from the merge branch. If the branch you're on has breaking
 tests, you may want to get it out of your `merge_branch`, and this will do that and ensure that the next times

data/bin/flash_flow

@@ -7,6 +7,9 @@ options = FlashFlow::Options.parse
 if options[:install]
   FlashFlow::Install.install
   exit(0)
+elsif options[:version]
+  puts "Flash flow version #{FlashFlow::VERSION}\n"
+  exit(0)
 end
 
 FlashFlow::Config.configure!(options[:config_file])

data/flash_flow.gemspec

@@ -8,7 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Flashfunders"]
   spec.email         = ["engineering@flashfunders.com"]
   spec.summary       = %q{Implementation of the flashfunders workflow}
-  spec.homepage      = ""
+  spec.description   = %q{Flash flow is a command line tool for keeping your acceptance environment up to date}
+  spec.homepage      = "https://github.com/FlashFunders/flash_flow"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -16,13 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'octokit'
-  spec.add_dependency 'hipchat'
-  spec.add_dependency 'pivotal-tracker'
+  spec.add_dependency 'octokit', "~> 4.1"
+  spec.add_dependency 'hipchat', "~> 1.5"
+  spec.add_dependency 'pivotal-tracker', "~> 0.5"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency 'minitest-stub_any_instance'
+  spec.add_development_dependency "rake", "> 0"
+  spec.add_development_dependency "minitest", "> 0"
+  spec.add_development_dependency "byebug", "> 0"
+  spec.add_development_dependency 'minitest-stub_any_instance', "> 0"
 end

data/lib/flash_flow/data/store.rb

@@ -22,12 +22,21 @@ module FlashFlow
       def write(branches, file=nil)
         @git.in_temp_merge_branch do
           file ||= File.open(@filename, 'w')
-          file.puts JSON.pretty_generate(branches)
+          file.puts JSON.pretty_generate(sort_branches(branches))
           file.close
 
           @git.add_and_commit(@filename, 'Branch Info', add: { force: true })
         end
       end
+
+      private
+
+      def sort_branches(branches)
+        return branches unless branches.is_a?(Hash)
+        sorted_branches = {}
+        branches.keys.sort.each { |key| sorted_branches[key] = sort_branches(branches[key]) }
+        sorted_branches
+      end
     end
   end
-end
+end

data/lib/flash_flow/options.rb

@@ -9,6 +9,7 @@ module FlashFlow
         opts.separator ""
 
         opts.on('--install', 'Copy flash_flow.yml.erb to your repo and exit') { |v| options[:install] = true }
+        opts.on('-v', '--version', 'Print the current version of flash flow and exit') { |v| options[:version] = true }
         opts.on('--prod-deploy', 'Run IssueTracker#deploy_production and exit') { |v| options[:prod_deploy] = true }
         opts.on('--review-deploy', 'Run IssueTracker#deploy_review and exit') { |v| options[:review_deploy] = true }
         opts.on('--release-notes hours', 'Run IssueTracker#release_notes and exit') { |v| options[:release_notes] = v }

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/lib/data/test_store.rb

@@ -4,13 +4,6 @@ require 'flash_flow/data/store'
 module FlashFlow
   module Data
     class TestStore < Minitest::Test
-      def sample_branches
-        {
-            'origin/branch 1' => {'branch' => 'branch 1', 'remote' => 'origin', 'status' => 'success', 'stories' => ['123']},
-            'other_origin/branch 2' => {'branch' => 'branch 2', 'remote' => 'origin', 'status' => 'success', 'stories' => ['456']}
-        }
-      end
-
       def setup
         @mock_git = MockGit.new
         @collection = Collection.new({ 'origin' => 'the_origin_url' })
@@ -28,15 +21,40 @@ module FlashFlow
         str = StringIO.new
         @storage.write(old_branches, str)
 
-        assert_equal(str.string.strip, JSON.pretty_generate(old_branches).strip)
+        assert_equal(str.string.strip, JSON.pretty_generate(sorted_branches).strip)
       end
 
       private # Helpers
 
       def old_branches
         @old_branches ||= {
-            'the_origin_url/some_old_branch' => {'ref' => 'some_old_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'created_at' => (Time.now - 3600).to_s, 'stories' => ['111']},
-            'the_origin_url/some_branch' => {'ref' => 'some_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'status' => 'success', 'created_at' => (Time.now - 1800).to_s, 'stories' => ['222']}
+            'version' => '1.0.0',
+            'branches' => {
+              'the_origin_url/some_old_branch' => {'ref' => 'some_old_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'created_at' => (Time.now - 3600).to_s, 'stories' => ['111']},
+              'the_origin_url/some_branch' => {'ref' => 'some_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'status' => 'success', 'created_at' => (Time.now - 1800).to_s, 'stories' => ['222']}
+            }
+          }
+      end
+
+      def sorted_branches
+        @sorted_branches ||= {
+            'branches' => {
+                'the_origin_url/some_branch' => {
+                    'created_at' => (Time.now - 1800).to_s,
+                    'ref' => 'some_branch',
+                    'remote' => 'origin',
+                    'remote_url' => 'the_origin_url',
+                    'status' => 'success',
+                    'stories' => ['222']
+                },
+                'the_origin_url/some_old_branch' => {
+                    'created_at' => (Time.now - 3600).to_s,
+                    'ref' => 'some_old_branch',
+                    'remote' => 'origin',
+                    'remote_url' => 'the_origin_url',
+                    'stories' => ['111']},
+            },
+            'version' => '1.0.0',
         }
       end
     end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: hipchat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,59 +70,60 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-stub_any_instance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Flash flow is a command line tool for keeping your acceptance environment
+  up to date
 email:
 - engineering@flashfunders.com
 executables:
@@ -180,7 +181,7 @@ files:
 - test/lib/test_notifier.rb
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb
-homepage: ''
+homepage: https://github.com/FlashFunders/flash_flow
 licenses:
 - MIT
 metadata: {}