trello_flow 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed3adf035887ea1b0ced5801b46da8e9479f9f42
-  data.tar.gz: 807ee2ec7032e537309309acf47475dbf5d1a4ff
+  metadata.gz: 3618ad36b3d55822f45748524afd2cd3e7586ee6
+  data.tar.gz: dc9b1e38ba649fe530c0a216cbda31e04c23a88a
 SHA512:
-  metadata.gz: 7575207b7441e554e6c03805a1a578e6ddfaf24ff33b01fcabcc96029669c0cc4dcced0430762323363649d1c5b54504e586b4e789154f2dc5ed081eb27fcf8b
-  data.tar.gz: 045407f54a511bfeae697b87f68d139a437c34c1a1c530af3a5fa39a7a011ea6f091a7d431f68c3e10b973f021f9b23cf694b525517e29be1f8facf8c27bba12
+  metadata.gz: 52a3872c775e9253203ead4c1f01ff704d30cc525526a20c9530a8b7fb2c44c9e0ff5df40973a931aacf1ee1b9c3d6b9f04a17503ddc633124c24e33e8eefc48
+  data.tar.gz: ee35f9e9a3a50296e965cd259ef01daefaf7c854fd5303644574ea5253c7f827dff14997c1d53863885e97ece84de0243f7b759a66ea98b5211cfe29e1150c51

data/lib/trello_flow.rb

@@ -1,7 +1,6 @@
 require "trello_flow/version"
 require "trello_flow/cli"
 require "trello_flow/table"
-require "trello_flow/config"
 require "trello_flow/branch"
 require "trello_flow/cleanup"
 require "trello_flow/main"

data/lib/trello_flow/config_store.rb

@@ -0,0 +1,32 @@
+module TrelloFlow
+  class ConfigStore
+    def initialize(path)
+      @path = path
+    end
+
+    def [](key)
+      data[key]
+    end
+
+    def save(key, value)
+      data[key] = value
+      File.new(path, "w") unless File.exists?(path)
+      File.open(path, "w") { |f| f.write(data.to_yaml) }
+      value
+    end
+
+    private
+
+      attr_reader :path
+
+      def data
+        @_data ||= load_data
+      end
+
+      def load_data
+        YAML.load File.read(path)
+      rescue
+        {}
+      end
+  end
+end

data/lib/trello_flow/global_config.rb

@@ -0,0 +1,39 @@
+require "trello_flow/config_store"
+require "trello_flow/api/base"
+
+module TrelloFlow
+  class GlobalConfig
+    PATH = ENV["HOME"] + "/.trello_flow"
+
+    def initialize(store = nil)
+      @store = store || ConfigStore.new(PATH)
+    end
+
+    def key
+      @_key ||= store[:key] || configure_key
+    end
+
+    def token
+      @_token ||= store[:token] || configure_token
+    end
+
+    private
+
+      attr_reader :store
+
+      def configure_key
+        Cli.ask "Press enter to setup Trello for this project (will open public key url)"
+        Cli.open_url "https://trello.com/app-key"
+        store.save :key, Cli.ask("Input Developer API key")
+      end
+
+      def configure_token
+        Cli.open_url authorize_url(key)
+        store.save :token, Cli.ask("Input member token")
+      end
+
+      def authorize_url(key)
+        "https://trello.com/1/authorize?key=#{key}&name=Trello-Flow&scope=read,write,account&expiration=never&response_type=token"
+      end
+  end
+end

data/lib/trello_flow/local_config.rb

@@ -0,0 +1,29 @@
+module TrelloFlow
+  class LocalConfig
+    PATH = ".trello_flow"
+
+    def initialize(store = nil)
+      @store = store || ConfigStore.new(PATH)
+    end
+
+    def board
+      @_board ||= Api::Board.find(board_id)
+    end
+
+    private
+
+      attr_reader :store
+
+      def board_id
+        @_board_id ||= store[:board_id] || configure_board_id
+      end
+
+      def configure_board_id
+        store.save :board_id, Table.pick(current_user.boards.active).id
+      end
+
+      def current_user
+        Api::Member.current
+      end
+  end
+end

data/lib/trello_flow/main.rb

@@ -1,7 +1,11 @@
+require "trello_flow/local_config"
+require "trello_flow/global_config"
+
 module TrelloFlow
   class Main
-    def initialize(config = Config.new)
-      @config = config
+    def initialize(global_config = GlobalConfig.new, local_config = LocalConfig.new)
+      Api::Base.configure(key: global_config.key, token: global_config.token)
+      @local_config = local_config
     end
 
     def start(name)
@@ -28,6 +32,12 @@ module TrelloFlow
 
     private
 
+      attr_reader :local_config
+
+      def board
+        @_board ||= local_config.board
+      end
+
       def create_or_pick_card(name)
         if name.to_s.start_with?("http")
           Api::Card.find_by_url(name)
@@ -39,12 +49,10 @@ module TrelloFlow
       end
 
       def create_new_card(name)
-        board = Table.pick(current_user.boards.active)
         board.lists.backlog.cards.create name: name
       end
 
       def pick_existing_card
-        board = Table.pick(current_user.boards.active)
         Table.pick board.lists.backlog.cards
       end
 

data/lib/trello_flow/version.rb

@@ -1,3 +1,3 @@
 module TrelloFlow
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trello_flow
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,7 +238,9 @@ files:
 - lib/trello_flow/branch.rb
 - lib/trello_flow/cleanup.rb
 - lib/trello_flow/cli.rb
-- lib/trello_flow/config.rb
+- lib/trello_flow/config_store.rb
+- lib/trello_flow/global_config.rb
+- lib/trello_flow/local_config.rb
 - lib/trello_flow/main.rb
 - lib/trello_flow/pull_request.rb
 - lib/trello_flow/repo.rb
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: GitHub/Trello flow gemified.

data/lib/trello_flow/config.rb

@@ -1,52 +0,0 @@
-require "trello_flow/api/base"
-
-module TrelloFlow
-  class Config
-    PATH = ENV["HOME"] + "/.trello_flow"
-
-    def initialize(data = load_data || {})
-      @data = data
-      Api::Base.configure(key: key, token: token)
-    end
-
-    private
-
-      attr_reader :data
-
-      def load_data
-        YAML.load(File.read(PATH))
-      rescue
-        false
-      end
-
-      def key
-        @_key ||= data[:key] || configure_key
-      end
-
-      def token
-        @_token ||= data[:token] || configure_token
-      end
-
-      def configure_key
-        Cli.ask "Press enter to setup Trello for this project (will open public key url)"
-        Cli.open_url "https://trello.com/app-key"
-        save :key, Cli.ask("Input Developer API key")
-      end
-
-      def configure_token
-        Cli.open_url authorize_url(key)
-        save :token, Cli.ask("Input member token")
-      end
-
-      def save(key, value)
-        data[key] = value
-        File.new(PATH, "w") unless File.exists?(PATH)
-        File.open(PATH, "w") { |f| f.write(data.to_yaml) }
-        value
-      end
-
-      def authorize_url(key)
-        "https://trello.com/1/authorize?key=#{key}&name=Trello-Flow&scope=read,write,account&expiration=never&response_type=token"
-      end
-  end
-end