zenflow 0.8.11 → 0.8.12

data/spec/zenflow/helpers/repo_spec.rb

@@ -20,60 +20,4 @@ describe Zenflow::Repo do
       expect(Zenflow::Repo.slug).to eq("zencoder/zenflow")
     end
   end
-
-  describe '.is_current_hub?' do
-    before(:each){  
-      Zenflow::Repo.should_receive(:url).twice.and_return("git@github.com:zencoder/zenflow.git")
-    }
-
-    context 'when check matches hub' do
-      it 'returns true' do
-        expect(Zenflow::Repo.is_current_hub?("github.com")).to eq(true)
-      end
-    end
-
-    context 'when check does not match hub' do
-      it 'returns false' do
-        expect(Zenflow::Repo.is_current_hub?("my-hub")).to eq(false)
-      end
-    end
-  end
-
-  describe '.is_default_hub?' do
-    context 'when check is not supplied' do
-      context 'and current hub matches default hub' do
-        before(:each){  
-          Zenflow::Repo.should_receive(:url).twice.and_return("git@github.com:zencoder/zenflow.git")
-        }
-
-        it 'returns true' do
-          expect(Zenflow::Repo.is_default_hub?).to eq(true)
-        end
-      end
-
-      context 'and current hub does not match default hub' do
-        before(:each){  
-          Zenflow::Repo.should_receive(:url).twice.and_return("git@my-hub:zencoder/zenflow.git")
-        }
-
-        it 'returns true' do
-          expect(Zenflow::Repo.is_default_hub?).to eq(false)
-        end
-      end
-    end
-
-    context 'when check is supplied' do
-      context 'and check matches default hub' do
-        it 'returns true' do
-          expect(Zenflow::Repo.is_default_hub?("github.com")).to eq(true)
-        end
-      end
-
-      context 'and check does not match default hub' do
-        it 'returns false' do
-          expect(Zenflow::Repo.is_default_hub?("my-hub")).to eq(false)
-        end
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenflow
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Adam Kittelson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -191,10 +191,10 @@ files:
 - bin/zenflow
 - lib/zenflow.rb
 - lib/zenflow/cli.rb
+- lib/zenflow/commands/admin.rb
 - lib/zenflow/commands/deploy.rb
 - lib/zenflow/commands/feature.rb
 - lib/zenflow/commands/hotfix.rb
-- lib/zenflow/commands/hubs.rb
 - lib/zenflow/commands/release.rb
 - lib/zenflow/commands/reviews.rb
 - lib/zenflow/helpers/ask.rb
@@ -230,17 +230,17 @@ files:
 - spec/fixtures/cassettes/unexisting_pull_request.yml
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_version_number.rb
+- spec/zenflow/cli_spec.rb
+- spec/zenflow/commands/admin_spec.rb
 - spec/zenflow/commands/deploy_spec.rb
 - spec/zenflow/commands/feature_spec.rb
 - spec/zenflow/commands/hotfix_spec.rb
-- spec/zenflow/commands/hubs_spec.rb
 - spec/zenflow/commands/release_spec.rb
 - spec/zenflow/commands/reviews_spec.rb
 - spec/zenflow/helpers/ask_spec.rb
 - spec/zenflow/helpers/branch_command_spec.rb
 - spec/zenflow/helpers/branch_spec.rb
 - spec/zenflow/helpers/changelog_spec.rb
-- spec/zenflow/helpers/cli_spec.rb
 - spec/zenflow/helpers/github_spec.rb
 - spec/zenflow/helpers/help_spec.rb
 - spec/zenflow/helpers/log_spec.rb

data/lib/zenflow/commands/hubs.rb

@@ -1,124 +0,0 @@
-module Zenflow
-  class Hubs < Thor
-
-    desc "list", "Show all configured hubs."
-    def list
-      Zenflow::Log("Recogized hubs")
-      Zenflow::Log(Terminal::Table.new(
-        headings: ['Hub'],
-        rows: get_list_of_hubs()
-      ).to_s, indent: false, arrows: false, color: false)
-    end
-
-    desc "current", "Show the current project's hub."
-    def current
-      Zenflow::Log("This project's hub is #{hub_label(Zenflow::Repo.hub)}")
-    end
-
-    desc "describe [HUB]", "Show configuration details for HUB (current project hub if none specified, or default hub if no current project)."
-    def describe(hub=nil)
-      hub = Zenflow::Github.resolve_hub(hub)
-
-      Zenflow::Log("Configuration details for hub #{hub_label(hub)}")
-
-      Zenflow::Log(Terminal::Table.new(
-        headings: ["Parameter", "Github Config Key", "Github Config Value", "Value (with system defaults)"],
-        rows: Zenflow::Github.describe_hub(hub)
-      ).to_s, indent: false, arrows: false, color: false)
-    end
-
-    desc "config [HUB]", "Configure the specified HUB (current project hub if none specified, or default hub if no current project)."
-    def config(hub=nil)
-      hub = Zenflow::Github.resolve_hub(hub)
-
-      Zenflow::Log("Configuring #{hub_label(hub)}")
-
-      config_api_base_url(hub)
-      config_user(hub)
-      config_user_agent_base(hub)
-    end
-
-    desc "authorize [HUB]", "Grab an auth token for HUB (current project hub if none specified, or default hub if no current project)."
-    def authorize(hub=nil)
-      hub = Zenflow::Github.resolve_hub(hub)
-
-      Zenflow::Log("Authorizing #{hub_label(hub)}")
-
-      if Zenflow::Github.zenflow_token(hub)
-        if Zenflow::Ask("You already have a token from GitHub. Do you want to set a new one?", :options => ["y", "N"], :default => "n") == "y"
-          Zenflow::Github.authorize(hub)
-        end
-      else
-        Zenflow::Github.authorize(hub)
-      end
-    end
-
-    no_commands {
-      def get_list_of_hubs
-        hub_config_parameters = Zenflow::Shell.run("git config --get-regexp zenflow\.hub\..*", silent: true).split("\n")
-
-        # unique, sorted, list of hubs with at least one valid config key
-        configured_hubs = hub_config_parameters.inject([]) { |hubs, parameter|
-          if parameter =~ /^zenflow\.hub\.(.*)\.#{config_keys_regex}\s.*$/
-            hubs << [hub_label($1)]
-          end
-
-          hubs
-        }.sort.uniq
-
-        [
-          ["#{hub_label(Zenflow::Github::DEFAULT_HUB)}"]
-        ] + configured_hubs
-      end
-
-      def hub_label(hub)
-        "#{hub}#{default_hub_tag(hub)}#{current_hub_tag(hub)}"
-      end
-
-      def default_hub_tag(hub)
-        Zenflow::Repo.is_default_hub?(hub) ? " [default]" : ""
-      end
-
-      def current_hub_tag(hub)
-        Zenflow::Repo.is_current_hub?(hub) ? " [current]" : ""
-      end
-
-      def config_keys_regex
-        "(?:#{Zenflow::Github::CONFIG_KEYS.map { |s| s.gsub('.','\\.') }.join('|')})"
-      end
-
-      def config_api_base_url(hub)
-        api_base_url = Zenflow::Github.api_base_url(hub,false)
-        if api_base_url.to_s != ''
-          if Zenflow::Ask("The GitHub API base URL for this hub is currently #{api_base_url}. Do you want to use that?", :options => ["Y", "n"], :default => "y") == "n"
-            Zenflow::Github.set_api_base_url(hub)
-          end
-        else
-          Zenflow::Github.set_api_base_url(hub)
-        end
-      end
-
-      def config_user(hub)
-        user = Zenflow::Github.user(hub)
-        if user.to_s != ''
-          if Zenflow::Ask("The GitHub user for this hub is currently #{user}. Do you want to use that?", :options => ["Y", "n"], :default => "y") == "n"
-            Zenflow::Github.set_user(hub)
-          end
-        else
-          Zenflow::Github.set_user(hub)
-        end
-      end
-
-      def config_user_agent_base(hub)
-        user_agent_base = Zenflow::Github.user_agent_base(hub,false)
-        if user_agent_base.to_s != ''
-          if Zenflow::Ask("The GitHub User Agent base for this hub is currently #{user_agent_base}. Do you want to use that?", :options => ["Y", "n"], :default => "y") == "n"
-            Zenflow::Github.set_user_agent_base(hub)
-          end
-        else
-          Zenflow::Github.set_user_agent_base(hub)
-        end
-      end
-    }
-  end
-end

data/spec/zenflow/commands/hubs_spec.rb

@@ -1,372 +0,0 @@
-require 'spec_helper'
-
-describe Zenflow::Hubs do
-  let(:hubs) { Zenflow::Hubs.new }
-
-  describe '.list' do
-    it 'lists recognized hubs in git config' do
-      Zenflow::Shell.should_receive(:run).with("git config --get-regexp zenflow\.hub\..*", silent: true).and_return(
-<<EOS
-zenflow.hub.hub.1.api.base.url api_base_url
-zenflow.hub.yet.another.hub.github.user github_user
-zenflow.hub.hub.1.token token
-zenflow.hub.my-hub.token token
-zenflow.hub.one.more.hub.user.agent.base user_agent_base
-zenflow.hub.bad.token.hub.goobers user_agent_base
-EOS
-      )
-      Zenflow::Repo.should_receive(:is_default_hub?).at_least(:once).with(anything()).and_return(false)
-      Zenflow::Repo.should_receive(:is_current_hub?).at_least(:once).with(anything()).and_return(false)
-      Zenflow.should_receive(:Log).with("Recogized hubs")
-      Terminal::Table.should_receive(:new).with(
-        headings: ["Hub"],
-        rows: [
-          ["github.com"],
-          ["hub.1"],
-          ["my-hub"],
-          ["one.more.hub"],
-          ["yet.another.hub"]
-        ]
-      ).and_return("log-data")
-      Zenflow.should_receive(:Log).with("log-data", indent: false, arrows: false, color: false)
-      hubs.list
-    end
-  end
-
-  describe '.current' do
-    it 'logs the hubs of the current project' do
-      Zenflow::Repo.should_receive(:hub).twice.and_return('my-hub')
-      Zenflow.should_receive(:Log).with("This project's hub is my-hub [current]")
-      hubs.current
-    end
-  end
-
-  describe '.describe' do
-    it 'displays config parameters for the hub' do
-      hubs.should_receive(:hub_label).with('my-hub').and_return('my-hub')
-      Zenflow.should_receive(:Log).with("Configuration details for hub my-hub")
-      Zenflow::Github.should_receive(:describe_hub).with('my-hub').and_return([
-        ["Parameter 1", "Github Config Key 1", "Github Conifg Value 1", "Value 1"],
-        ["Parameter 2", "Github Config Key 2", "Github Conifg Value 2", "Value 2"],
-        ["Parameter 3", "Github Config Key 3", "Github Conifg Value 3", "Value 3"]
-      ])
-      Terminal::Table.should_receive(:new).with(
-        headings: ["Parameter", "Github Config Key", "Github Config Value", "Value (with system defaults)"],
-        rows: [
-          ["Parameter 1", "Github Config Key 1", "Github Conifg Value 1", "Value 1"],
-          ["Parameter 2", "Github Config Key 2", "Github Conifg Value 2", "Value 2"],
-          ["Parameter 3", "Github Config Key 3", "Github Conifg Value 3", "Value 3"]
-        ]
-      ).and_return("log-data")
-      Zenflow.should_receive(:Log).with("log-data", {:indent=>false, :arrows=>false, :color=>false})
-      hubs.describe('my-hub')
-    end
-  end
-
-  describe '.config' do
-    it 'calls the individual parameter config methods' do
-      Zenflow::Github.should_receive(:resolve_hub).with('my-hub').and_return('my-hub')
-      hubs.should_receive(:hub_label).with('my-hub').and_return('my-hub')
-      Zenflow.should_receive(:Log).with("Configuring my-hub")
-      hubs.should_receive(:config_api_base_url).with('my-hub')
-      hubs.should_receive(:config_user).with('my-hub')
-      hubs.should_receive(:config_user_agent_base).with('my-hub')
-      hubs.config('my-hub')
-    end
-  end
-
-  describe '.config_user' do
-    context 'when a github user is already saved' do
-      before do
-        Zenflow::Github.should_receive(:user).and_return('user')
-      end
-
-      context 'and the user decides to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('n')
-        end
-
-        it 'asks for a user' do
-          Zenflow::Github.should_receive(:set_user)
-          hubs.config_user('my-hub')
-        end
-      end
-
-      context 'and the user decides not to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('y')
-        end
-
-        it 'does not ask for a user' do
-          Zenflow::Github.should_not_receive(:set_user)
-          hubs.config_user('my-hub')
-        end
-      end
-    end
-
-    context 'when a user is not already saved' do
-      before do
-        Zenflow::Github.should_receive(:user).and_return(nil)
-      end
-
-      it 'asks for a user' do
-        Zenflow::Github.should_receive(:set_user)
-        hubs.config_user('my-hub')
-      end
-    end
-  end
-
-  describe '.authorize' do
-    before do
-      Zenflow::Github.should_receive(:resolve_hub).with('my-hub').and_return('my-hub')
-      hubs.should_receive(:hub_label).with('my-hub').and_return('my-hub')
-      Zenflow.should_receive(:Log).with("Authorizing my-hub")
-    end
-
-    context 'when a zenflow_token is already saved' do
-      before do
-        Zenflow::Github.should_receive(:zenflow_token).and_return('super secret token')
-      end
-
-      context 'and the user decides to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('y')
-        end
-
-        it 'authorizes with Github' do
-          Zenflow::Github.should_receive(:authorize).with('my-hub')
-          hubs.authorize('my-hub')
-        end
-      end
-
-      context 'and the user decides not to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('n')
-        end
-
-        it 'does not authorize with Github' do
-          Zenflow::Github.should_not_receive(:authorize)
-          hubs.authorize('my-hub')
-        end
-      end
-    end
-
-    context 'when a zenflow_token is not already saved' do
-      before do
-        Zenflow::Github.should_receive(:zenflow_token).and_return(nil)
-      end
-
-      it 'authorizes with Github' do
-        Zenflow::Github.should_receive(:authorize).with('my-hub')
-        hubs.authorize('my-hub')
-      end
-    end
-  end
-
-  describe '.hub_label' do
-    context 'hub is default hub' do
-      context 'hub is current hub' do
-        before(:each){
-          Zenflow::Repo.should_receive(:hub).and_return(Zenflow::Github::DEFAULT_HUB)
-        }
-
-        it 'returns the expected label' do
-          expect(hubs.hub_label(Zenflow::Github::DEFAULT_HUB)).to eq("#{Zenflow::Github::DEFAULT_HUB} [default] [current]")
-        end
-      end
-
-      context 'hub is not current hub' do
-        before(:each){
-          Zenflow::Repo.should_receive(:hub).and_return('current-hub')
-        }
-
-        it 'returns the expected label' do
-          expect(hubs.hub_label(Zenflow::Github::DEFAULT_HUB)).to eq("#{Zenflow::Github::DEFAULT_HUB} [default]")
-        end
-      end
-    end
-
-    context 'hub is not default hub' do
-      context 'hub is current hub' do
-        before(:each){
-          Zenflow::Repo.should_receive(:hub).and_return('current-hub')
-        }
-
-        it 'returns the expected label' do
-          expect(hubs.hub_label('current-hub')).to eq('current-hub [current]')
-        end
-      end
-
-      context 'hub is not current hub' do
-        before(:each){
-          Zenflow::Repo.should_receive(:hub).and_return('default-hub')
-        }
-
-        it 'returns the expected label' do
-          expect(hubs.hub_label('not-current-hub')).to eq('not-current-hub')
-        end
-      end
-    end
-  end
-
-  describe '.default_hub_tag' do
-    context 'hub is default hub' do
-      it 'returns the expected tag' do
-        expect(hubs.default_hub_tag(Zenflow::Github::DEFAULT_HUB)).to eq(' [default]')
-      end
-    end
-
-    context 'hub is not default hub' do
-      it 'returns the expected tag' do
-        expect(hubs.default_hub_tag('not-default-hub')).to eq('')
-      end
-    end
-  end
-
-  describe '.current_hub_tag' do
-    before(:each){
-      Zenflow::Repo.should_receive(:hub).and_return('current-hub')
-    }
-
-    context 'hub is current hub' do
-      it 'returns the expected tag' do
-        expect(hubs.current_hub_tag('current-hub')).to eq(' [current]')
-      end
-    end
-
-    context 'hub is not current hub' do
-      it 'returns the expected tag' do
-        expect(hubs.current_hub_tag('not-current-hub')).to eq('')
-      end
-    end
-  end
-
-  describe '.config_key_regex' do
-    it 'returns the expected regex' do
-      expect(hubs.config_keys_regex).to eq('(?:api\\.base\\.url|github\\.user|token|user\\.agent\\.base)')
-    end
-  end
-
-  describe '.config_api_base_url' do
-    context 'when a github api base url is already saved' do
-      before do
-        Zenflow::Github.should_receive(:api_base_url).and_return('api-base-url')
-      end
-
-      context 'and the user decides to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('n')
-        end
-
-        it 'asks for an api base url' do
-          Zenflow::Github.should_receive(:set_api_base_url)
-          hubs.config_api_base_url('my-hub')
-        end
-      end
-
-      context 'and the user decides not to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('y')
-        end
-
-        it 'does not ask for an api base url' do
-          Zenflow::Github.should_not_receive(:set_api_base_url)
-          hubs.config_api_base_url('my-hub')
-        end
-      end
-    end
-
-    context 'when an api base url is not already saved' do
-      before do
-        Zenflow::Github.should_receive(:api_base_url).and_return(nil)
-      end
-
-      it 'asks for an api base url' do
-        Zenflow::Github.should_receive(:set_api_base_url)
-        hubs.config_api_base_url('my-hub')
-      end
-    end
-  end
-
-  describe '.config_user' do
-    context 'when a github user is already saved' do
-      before do
-        Zenflow::Github.should_receive(:user).and_return('user')
-      end
-
-      context 'and the user decides to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('n')
-        end
-
-        it 'asks for a user' do
-          Zenflow::Github.should_receive(:set_user)
-          hubs.config_user('my-hub')
-        end
-      end
-
-      context 'and the user decides not to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('y')
-        end
-
-        it 'does not ask for a user' do
-          Zenflow::Github.should_not_receive(:set_user)
-          hubs.config_user('my-hub')
-        end
-      end
-    end
-
-    context 'when a user is not already saved' do
-      before do
-        Zenflow::Github.should_receive(:user).and_return(nil)
-      end
-
-      it 'asks for a user' do
-        Zenflow::Github.should_receive(:set_user)
-        hubs.config_user('my-hub')
-      end
-    end
-  end
-
-  describe '.config_user_agent_base' do
-    context 'when a github user agent base is already saved' do
-      before do
-        Zenflow::Github.should_receive(:user_agent_base).and_return('user-agent-base')
-      end
-
-      context 'and the user decides to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('n')
-        end
-
-        it 'asks for a user agent base' do
-          Zenflow::Github.should_receive(:set_user_agent_base)
-          hubs.config_user_agent_base('my-hub')
-        end
-      end
-
-      context 'and the user decides not to set a new one' do
-        before do
-          Zenflow.should_receive(:Ask).and_return('y')
-        end
-
-        it 'does not ask for a user agent base' do
-          Zenflow::Github.should_not_receive(:set_user_agent_base)
-          hubs.config_user_agent_base('my-hub')
-        end
-      end
-    end
-
-    context 'when a user agent base is not already saved' do
-      before do
-        Zenflow::Github.should_receive(:user_agent_base).and_return(nil)
-      end
-
-      it 'asks for a user agent base' do
-        Zenflow::Github.should_receive(:set_user_agent_base)
-        hubs.config_user_agent_base('my-hub')
-      end
-    end
-  end
-end