hackpad-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11393a54a4eee8671b2f1408c718cae2acf0636a
-  data.tar.gz: c8e34dc2fc56963f34fd9359d56567010571e5e1
+  metadata.gz: 8774385bd325fd9f7f74ec8e474ac4fdd046792a
+  data.tar.gz: f920f8ef31cb29a8c13a6dc526924f3e511a1008
 SHA512:
-  metadata.gz: 3bdad090ea55e18a3919a8b284d73e30578ddb2624b0f1b156f72f9b83c3c7cde85cdd31fe1fe8bd6bd54ce34318c50466a594b2737cdae534477222a255df50
-  data.tar.gz: 0efabd1139cea5ab5386f57f5d581631b497086c4d60b3623e886822efc61f2505ae71991f5d834fced5755ee8b2226daf30aa5d4d4cb7f8f4decfcd5637dfa5
+  metadata.gz: ea50d0b7e670b9f84d2db83602e14e5774b6aa0001fd076b56cd8410d4e41d10ff4a2c5ebaffb2aae26023cdcca6de55edf3dfe9860100331291736b1a2f9f57
+  data.tar.gz: 76318cb2d86cc38a35fa2da5b896b3b679fb8e61517709bd49fe6f761fca6106ac8c9c53bd4603df105aa98a09e5fa639e062a738a337d5ea9854cd31b698ebb

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.2.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Hackpad-cli changelog
 =====================
 
+v0.1.3 - wip
+-------------------
+
+- add command `add` for adding a new workspace
+- refactor config management and move code to the configstruct gem
+
 v0.1.2 - 2014-05-27
 -------------------
 

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hackpad-cli.gemspec
 gemspec
 
+#gem 'configstruct', path: '../configstruct'

data/README.md

@@ -42,6 +42,7 @@ Usage
 
 ```
 Commands:
+  hpcli add                     # Add a new workspace.
   hpcli default                 # change the default workspace.
   hpcli getnew                  # Downloads the new pads the are not cached yet (options: -u to show urls).
   hpcli help [COMMAND]          # Describe available commands or one specific command
@@ -54,7 +55,7 @@ Commands:
   hpcli workspaces              # Lists configurated hackpad workspaces.
 
 Options:
-  -c, [--configdir=CONFIGDIR]  # Path to the hackpad-cli directory to use.
+  -c, [--basedir=BASEDIR]      # Path to the hackpad-cli directory to use.
                                # Default: /home/mose/.hackpad-cli/
   -w, [--workspace=WORKSPACE]  # Name of the workspace to use.
                                # Default: default
@@ -76,7 +77,8 @@ Check the [Changelog](CHANGELOG.md) for past evolutions.
   - <s>display cached date in output</s>
   - <s>write proper tests</s>
 - for v0.2.0
-  - clean the markdown generated by reverse_markdown
+  - <s>clean the markdown generated by reverse_markdown</s>
+  - <s>flood hackpad support to get some improvements done</s>
   - add a command for searching on local cache, in titles only or in body
   - elaborate a better search syntax so we can have and/or and strings
   - add commands for creating a new pad, linked to $EDITOR

data/hackpad-cli.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hackpad/cli/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'hackpad-cli'
-  spec.version       = Hackpad::Cli::VERSION
+  spec.version       = File.read(File.expand_path('../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
   spec.authors       = ['mose']
   spec.email         = ['mose@mose.com']
   spec.summary       = %q(CLI for hackpad browsing and editing.)
@@ -19,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'cliprompt', '~> 0.0.5'
+  spec.add_dependency 'configstruct', '~> 0.0.3'
+  spec.add_dependency 'cliprompt', '~> 0.1.0'
   spec.add_dependency 'paint'
   spec.add_dependency 'oauth'
   spec.add_dependency 'reverse_markdown'

data/lib/hackpad/cli/api.rb

@@ -3,6 +3,8 @@ require 'net/http'
 require 'json'
 require 'reverse_markdown'
 
+require_relative '../../reverse_markdown/converters/head'
+
 module Hackpad
   module Cli
 
@@ -12,13 +14,9 @@ module Hackpad
     module Api
       module_function
 
-      def prepare(config)
-        consumer = OAuth::Consumer.new(
-          config.client_id,
-          config.secret,
-          site: config.site
-        )
-        @token = OAuth::AccessToken.new consumer
+      def prepare(workspace)
+        @hackpad ||= OAuth::Consumer.new(workspace.client_id, workspace.secret, site: workspace.site)
+        @version = File.read(File.expand_path('../../../../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
       end
 
       def search(term, start = 0)
@@ -35,12 +33,12 @@ module Hackpad
 
       def read(id, ext)
         realext = (ext == 'md') ? 'html' : ext
-        get "/api/1.0/pad/#{id}/content.#{realext}", false, (ext == 'md')
+        get "/api/1.0/pad/#{id}/content/latest.#{realext}", false, (ext == 'md')
       end
 
       def get(url, json = true, to_md = false)
-        res = @token.get url, 'User-Agent' => "hackpad-cli v#{Hackpad::Cli::VERSION}"
-        if res.is_a? Net::HTTPSuccess
+        res = @hackpad.request :get, url
+        if res.is_a? Net::HTTPOK
           if json
             JSON.parse(res.body)
           else
@@ -57,10 +55,11 @@ module Hackpad
 
       def cleanup_md(text)
         back = ReverseMarkdown.convert(text, github_flavored: true).strip
-        back.sub!(/<head>.*<\/head>\n/m, '')
-        back.gsub!(/-([^\n]+)\n\n  -/m, "-\\1\n  -")
-        back.gsub!(/\n(  )*-([^\n]+)\n?\n(  )*-([^\n]+)\n?\n/m, "\n\\1-\\2\n\\3-\\4\n")
-        back.gsub(/\n\n\*\*([^\*]+)\*\*\n\n/, "\n\n### \\1\n\n")
+        back.gsub!(/\n-\s*\n/m, "\n") # empty list items
+        back.gsub!(/\n\\\*\s*\n/m, "\n") # images are shown as \*
+        back.gsub!(/-([^\n]+)\n\n  -/m, "-\\1\n  -") # avoid extra blank lines in lists
+        back.gsub!(/\n(  )*-([^\n]+)\n?\n(  )*-([^\n]+)\n?\n/m, "\n\\1-\\2\n\\3-\\4\n") # another more generalist for lists
+        back.gsub(/\n\n?\*\*([^\*]+)\*\*\n\n?/, "\n\n### \\1\n\n") # transform isolated titles from bold to h3
       end
 
     end

data/lib/hackpad/cli/client.rb

@@ -1,6 +1,7 @@
 require 'paint'
 
 require_relative 'config'
+require_relative 'workspace'
 require_relative 'api'
 require_relative 'store'
 require_relative 'pad'
@@ -15,13 +16,17 @@ module Hackpad
       def initialize(options, input = STDIN, output = STDOUT)
         @output = output
         @input = input
-        @options = options
-        @config = Config.new @options, input, output
-        Store.prepare @config
-        Api.prepare @config
-        if @options[:plain] == true || @config.use_colors == false
+        @config = Config.new options, @input, @output
+        if options[:plain] == true || @config.use_colors == false
           Paint.mode = 0
         end
+        @workspace = Workspace.new({ basedir: File.join(@config.basedir, @config.workspace), name: @config.workspace }, @input, @output)
+        Store.prepare @config, @workspace
+        Api.prepare @workspace
+      end
+
+      def add
+        @workspace.clone.create
       end
 
       def workspaces
@@ -38,7 +43,7 @@ module Hackpad
       end
 
       def stats
-        table 'Site', Paint[@config.site, :blue]
+        table 'Site', Paint[@workspace.site, :blue]
         table 'Cached Pads', Store.count_pads
         table 'Last Refresh', Store.last_refresh || 'not refreshed yet'
       end
@@ -52,7 +57,7 @@ module Hackpad
       end
 
       def list
-        @output.puts Padlist.get_list(@options['refresh']).map { |pad|
+        @output.puts Padlist.get_list(@config.refresh).map { |pad|
           padline pad
         }
       end
@@ -74,7 +79,7 @@ module Hackpad
         pad.load 'txt'
         table 'Id', Paint[id, :bold]
         table 'Title', Paint[pad.title, :yellow]
-        table 'URI', "#{@config.site}/#{id}"
+        table 'URI', "#{@workspace.site}/#{id}"
         table 'Chars', "#{pad.chars}"
         table 'Lines', "#{pad.lines}"
         table 'Guest Policy', "#{pad.guest_policy}"
@@ -91,7 +96,7 @@ module Hackpad
       private
 
       def padline(pad)
-        "#{(@config.site + '/') if @options[:urls]}#{pad.id} - #{pad.title}"
+        "#{(@workspace.site + '/') if @config.urls}#{pad.id} - #{pad.title}"
       end
 
       def unescape(s)
@@ -107,7 +112,7 @@ module Hackpad
       end
 
       def id_or_url(id)
-        "#{(@config.site + '/') if @options[:urls]}#{Paint[id, :bold]}"
+        "#{(@workspace.site + '/') if @config.urls}#{Paint[id, :bold]}"
       end
 
     end

data/lib/hackpad/cli/config.rb

@@ -1,65 +1,37 @@
-require 'ostruct'
 require 'cliprompt'
+require 'configstruct'
 
 module Hackpad
   module Cli
-    class Config < OpenStruct
+    class Config < ConfigStruct
 
       include Cliprompt
 
-      def initialize(options = nil, input = STDIN, output = STDOUT)
-        super(options)
-        @@input = input
-        @@output = output
-        self.configdir ||= File.join(ENV['HOME'], '.hackpad-cli')
+      def set_defaults
+        super
         self.refresh ||= false
         self.urls ||= false
-        self.output = output
-        setio input, output
-        patch_1
-        addvalues 'config'
         self.workspace ||= 'default'
-        self.workspacedir = File.join(configdir, workspace)
-        addvalues 'workspace'
+        setio @input, @output
+        patch_1
       end
 
-      def addvalues(type)
-        dir = send("#{type}dir".to_sym)
-        file = File.join(dir, 'config.yml')
-        FileUtils.mkdir_p dir unless Dir.exist? dir
-        send("setup_#{type}".to_sym, file) unless File.exist? file
-        YAML.load_file(file).each do |k, v|
-          new_ostruct_member(k)
-          send("#{k}=", v)
-        end
+      def setup
+        values = {}
+        output.puts Paint['Create a new hackpad-cli configuration:', :blue]
+        values['use_colors'] = guess 'HPCLI_COLORS', 'Do you want a colored output?', 'Yn'
+        values['workspace'] = guess 'HPCLI_WORKSPACE', 'What is the name of the default workspace?', 'default'
+        write values
       end
 
       def workspaces
-        w = Dir.glob(File.join(configdir, '*', 'config.yml')).reduce([]) do |a, path|
+        w = Dir.glob(File.join(self.basedir, '*', 'config.yml')).reduce([]) do |a, path|
           a << OpenStruct.new(name: File.basename(File.dirname(path)), site: YAML.load_file(path)['site'])
           a
         end
         w.sort_by { |s| s.name }
       end
 
-      def setup_config(file)
-        values = {}
-        output.puts Paint['Create a new hackpad-cli configuration:', :blue]
-        values['use_colors'] = guess 'HPCLI_COLORS', 'Do you want a colored output?', 'Yn'
-        values['workspace'] = guess 'HPCLI_WORKSPACE', 'What is the name of the default workspace?', 'default'
-        write(file, values)
-      end
-
-      def setup_workspace(file)
-        values = {}
-        output.puts Paint['Workspace configuration.', :blue]
-        output.puts Paint['Gather your information from https://<workspace>.hackpad.com/ep/account/settings/', :bold]
-        values['client_id'] = guess 'HPCLI_CLIENTID', 'What is your Client ID?'
-        values['secret'] = guess 'HPCLI_SECRET', 'What is your Secret Key?'
-        values['site'] = guess('HPCLI_URL', 'What is the URI of your workspace? (ex. https://xxx.hackapd.com)').gsub(/\/$/, '')
-        write(file, values)
-      end
-
       def change_default
         values = {}
         values['use_colors'] = use_colors
@@ -67,19 +39,12 @@ module Hackpad
           choices: workspaces.map(&:name),
           default: workspace,
           aslist: true
-        file = File.join(configdir, 'config.yml')
-        write(file, values)
+        write values
       end
 
       def patch_1
-        if File.exist? File.join(configdir, "#{workspace}.yml")
-          FileUtils.mv File.join(configdir, "#{workspace}.yml"), File.join(configdir, workspace, 'config.yml')
-        end
-      end
-
-      def write(file, values)
-        File.open(file, 'w') do |f|
-          f.write YAML.dump(values)
+        if File.exist? File.join(basedir, "#{workspace}.yml")
+          FileUtils.mv File.join(basedir, "#{workspace}.yml"), File.join(basedir, workspace, 'config.yml')
         end
       end
 

data/lib/hackpad/cli/runner.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require 'yaml'
 require_relative 'client'
-require_relative 'version'
 
 module Hackpad
   module Cli
@@ -25,7 +24,7 @@ module Hackpad
         }
       ]
 
-      class_option :configdir,
+      class_option :basedir,
         aliases: '-c',
         default: File.join(ENV['HOME'], '.hackpad-cli/'),
         desc:    'Path to the hackpad-cli directory to use.'
@@ -48,6 +47,11 @@ module Hackpad
         Hackpad::Cli::Client.new(options).workspaces
       end
 
+      desc 'add', 'Add a new workspace.'
+      def add
+        Hackpad::Cli::Client.new(options).add
+      end
+
       desc 'default', 'change the default workspace.'
       def default
         Hackpad::Cli::Client.new(options).default
@@ -90,7 +94,7 @@ module Hackpad
 
       desc 'version', 'Displays the hackpad-cli version.'
       def version
-        puts Hackpad::Cli::VERSION
+        puts File.read(File.expand_path('../../../../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
       end
 
     end

data/lib/hackpad/cli/store.rb

@@ -9,10 +9,10 @@ module Hackpad
     module Store
       module_function
 
-      def prepare(config)
+      def prepare(config, workspace)
         @refresh = config.refresh
-        @configdir = config.configdir
-        @pads_dir = File.join(config.workspacedir, 'pads')
+        @configdir = config.basedir
+        @pads_dir = File.join(workspace.basedir, 'pads')
         @list_cache = File.join(@pads_dir, 'padlist')
         prepare_dirs @pads_dir
       end

data/lib/hackpad/cli/workspace.rb

@@ -0,0 +1,37 @@
+require 'cliprompt'
+require 'configstruct'
+
+module Hackpad
+  module Cli
+    class Workspace < ConfigStruct
+
+      include Cliprompt
+
+      def set_defaults
+        super
+        self.name ||= 'default'
+        self.url ||= 'http://hackpad.com'
+        setio @input, @output
+      end
+
+      def setup
+        values = {}
+        puts Paint['Workspace configuration.', :blue]
+        puts Paint['Gather your information from https://<workspace>.hackpad.com/ep/account/settings/', :bold]
+        values['client_id'] = guess 'HPCLI_CLIENTID', 'What is your Client ID?'
+        values['secret'] = guess 'HPCLI_SECRET', 'What is your Secret Key?'
+        values['site'] = guess('HPCLI_URL', 'What is the URI of your workspace? (ex. https://xxx.hackpad.com)').gsub(/\/$/, '')
+        write values
+      end
+
+      def create
+        self.name = ask "What is the name of the new workspace?"
+        self.basedir = File.expand_path("../#{self.name}", self.basedir)
+        self.basefile = File.join(self.basedir, 'config.yml')
+        prepare_dirs
+        setup
+      end
+
+    end
+  end
+end

data/lib/reverse_markdown/converters/head.rb

@@ -0,0 +1,12 @@
+module ReverseMarkdown
+  module Converters
+    class Head < Base
+
+      def convert(node)
+        ''
+      end
+
+    end
+    register :head, Head.new
+  end
+end

data/spec/lib/hackpad/cli/api_spec.rb

@@ -70,7 +70,7 @@ describe Hackpad::Cli::Api do
           .with(headers: {
             'Accept' => '*/*',
             'Authorization' => /OAuth oauth_consumer_key="123"/,
-            'User-Agent' => /hackpad-cli v#{Hackpad::Cli::VERSION}/
+            'User-Agent' => /hackpad-cli v/
           })
           .to_return(status: 200, body: '{"some": "result"}')
         expect(Hackpad::Cli::Api.get('/api/1.0/xxx')).to eq('some' => 'result')
@@ -82,7 +82,7 @@ describe Hackpad::Cli::Api do
           .with(headers: {
             'Accept' => '*/*',
             'Authorization' => /OAuth oauth_consumer_key="123"/,
-            'User-Agent' => /hackpad-cli v#{Hackpad::Cli::VERSION}/
+            'User-Agent' => /hackpad-cli v/
           })
           .to_return(status: 404, body: '{"some": "result"}')
         expect { Hackpad::Cli::Api.get('/api/1.0/xxx') }

data/spec/lib/hackpad/cli/client_spec.rb

@@ -11,7 +11,7 @@ describe Hackpad::Cli::Client do
   let(:workspacefile) { File.join(workspacedir, 'config.yml') }
   let(:configvars) { { 'use_colors' => true, 'workspace' => 'default' } }
   let(:workspacevars) { { 'client_id' => '123', 'secret' => 'toto', 'site' => 'http://example.com' } }
-  let(:options) { { configdir: configdir, workspace: 'default' } }
+  let(:options) { { basedir: configdir, workspace: 'default' } }
   let(:format) { "%-20s %s\n" }
   let(:input) { StringIO.new }
   let(:output) { StringIO.new }
@@ -49,9 +49,8 @@ describe Hackpad::Cli::Client do
     after  { FileUtils.rm workspacefile2 if File.exist?(workspacefile2) }
 
     it do
-      expect(output).to receive(:printf).with(format, '> default', 'http://example.com')
-      expect(output).to receive(:printf).with(format, 'default2', 'http://2.example.com')
       client.workspaces
+      expect(output.string).to eq "> default            http://example.com\ndefault2             http://2.example.com\n"
     end
   end
 
@@ -66,8 +65,8 @@ describe Hackpad::Cli::Client do
     after  { FileUtils.rm workspacefile2 if File.exist?(workspacefile2) }
 
     it do
-      expect(output).to receive(:print).with("What workspace do you want to use as default from now on? \n> 0   default\n  1   default2\nChoose a number: [0] ")
       client.default
+      expect(output.string).to eq "What workspace do you want to use as default from now on? \n> 0   default\n  1   default2\nChoose a number: [0] "
       expect(YAML.load_file(configfile)['workspace']).to eq 'default2'
     end
   end
@@ -79,10 +78,8 @@ describe Hackpad::Cli::Client do
     before { Hackpad::Cli::Store.stub(:last_refresh).and_return(timestamp) }
     let(:client) { Hackpad::Cli::Client.new(options, input, output) }
     it do
-      expect(output).to receive(:printf).with(format, 'Site', Paint[workspacevars['site'], :blue])
-      expect(output).to receive(:printf).with(format, 'Cached Pads', 12)
-      expect(output).to receive(:printf).with(format, 'Last Refresh', timestamp)
       client.stats
+      expect(output.string).to eq "Site                 #{Paint[workspacevars['site'], :blue]}\nCached Pads          12\nLast Refresh         #{timestamp}\n"
     end
   end
 
@@ -111,9 +108,8 @@ describe Hackpad::Cli::Client do
     context 'when options sets urls to true,' do
       let(:client) { Hackpad::Cli::Client.new(options.merge(urls: true), input, output) }
       it do
-        expect(output).to receive(:puts).with("#{workspacevars['site']}/#{Paint['xxxxxx', :bold]} - #{Paint['xtitle', :yellow]}")
-        expect(output).to receive(:puts).with("   context #{Paint['x', :cyan, :bold]} context")
         client.search 'xxx'
+        expect(output.string).to eq "#{workspacevars['site']}/#{Paint['xxxxxx', :bold]} - #{Paint['xtitle', :yellow]}\n   context #{Paint['x', :cyan, :bold]} context\n"
       end
     end
   end
@@ -197,7 +193,7 @@ describe Hackpad::Cli::Client do
       before { pad.stub(:lines).and_return(2) }
       before { pad.stub(:guest_policy).and_return('open') }
       before { pad.stub(:moderated).and_return('false') }
-      before { pad.stub(:cached_at).and_return }
+      before { pad.stub(:cached_at).and_return('unknown') }
       it do
         expect(output).to receive(:printf).with(format, 'Id', Paint["123", :bold])
         expect(output).to receive(:printf).with(format, 'Title', Paint['title1', :yellow])
@@ -208,6 +204,7 @@ describe Hackpad::Cli::Client do
         expect(output).to receive(:printf).with(format, 'Moderated', 'false')
         expect(output).to receive(:printf).with(format, 'Cached', 'unknown')
         client.info '123'
+
       end
     end
 

data/spec/lib/hackpad/cli/config_spec.rb

@@ -7,50 +7,43 @@ describe Hackpad::Cli::Config do
 
   let(:configdir) { File.expand_path('../../../../files', __FILE__) }
   let(:configfile) { File.join(configdir, 'config.yml') }
-  let(:workspacedir) { File.join(configdir, 'default') }
-  let(:workspacefile) { File.join(workspacedir, 'config.yml') }
-  let(:options) { { configdir: configdir, workspace: 'default' } }
+  let(:options) { { basedir: configdir, workspace: 'default' } }
   let(:input) { StringIO.new }
   let(:output) { StringIO.new }
 
   before { FileUtils.mkdir_p configdir unless Dir.exist?(configdir) }
-  before { FileUtils.mkdir_p workspacedir unless Dir.exist?(workspacedir) }
-
   after { FileUtils.rm configfile if File.exist?(configfile) }
-  after { FileUtils.rm workspacefile if File.exist?(workspacefile) }
 
   describe '.new' do
     context 'when there is already config files created,' do
       let(:configvars) { { 'use_colors' => true, 'workspace' => 'default' } }
-      let(:workspacevars) { { 'client_id' => '123', 'secret' => 'toto', 'site' => 'http://example.com' } }
       before { File.open(configfile, 'w') { |f| f.puts YAML.dump(configvars) } }
-      before { File.open(workspacefile, 'w') { |f| f.puts YAML.dump(workspacevars) } }
       let(:config) { Hackpad::Cli::Config.new(options) }
       it {
-        expect(config.secret).to eq 'toto'
-        expect(config.site).to eq 'http://example.com'
+        expect(config.workspace).to eq 'default'
       }
     end
     context 'when there is no config files created,' do
-      before { input.stub(:gets).and_return('y', 'default', '123', 'toto','http://example.com') }
+      before { input.stub(:gets).and_return('y', 'default') }
       let(:config) { Hackpad::Cli::Config.new(options, input, output) }
       it {
-        expect(config.secret).to eq 'toto'
-        expect(config.site).to eq 'http://example.com'
+        expect(config.workspace).to eq 'default'
       }
     end
   end
 
   describe '.patch_1' do
     let(:oldconfigfile) { File.join(configdir, 'default.yml') }
+    let(:workspacefile) { File.join(configdir, 'default', 'config.yml') }
     let(:oldconfigvars) { { 'client_id' => '123', 'secret' => 'toto', 'site' => 'http://example.com' } }
     before { File.open(oldconfigfile, 'w') { |f| f.puts YAML.dump(oldconfigvars) } }
     before { input.stub(:gets).and_return('y', 'default') }
     after { FileUtils.rm oldconfigfile if File.exist?(oldconfigfile) }
+    after { FileUtils.rm workspacefile if File.exist?(workspacefile) }
     it do
       Hackpad::Cli::Config.new(options, input, output)
-      expect(File.exist? oldconfigfile).to be_false
-      expect(File.exist? configfile).to be_true
+      expect(File.exist? oldconfigfile).to be false
+      expect(File.exist? workspacefile).to be true
     end
   end
 

data/spec/lib/hackpad/cli/pad_spec.rb

@@ -16,7 +16,7 @@ describe Hackpad::Cli::Pad do
 
   describe '.cached?' do
     before { Hackpad::Cli::Store.stub(:exist?).and_return true }
-    it { expect(pad.cached?).to be_true }
+    it { expect(pad.cached?).to be true }
   end
 
   context 'when the pad has no data,' do
@@ -67,7 +67,7 @@ describe Hackpad::Cli::Pad do
         before { pad.load_from_provider Hackpad::Cli::Store, 'txt' }
         it { expect(pad.content).to eq "This\nis\nInformation!" }
         it { expect(pad.guest_policy).to eq 'open' }
-        it { expect(pad.moderated).to be_false }
+        it { expect(pad.moderated).to be false }
         it { expect(pad.cached_at).to eq 'some time' }
       end
     end

data/spec/lib/hackpad/cli/runner_spec.rb

@@ -26,6 +26,13 @@ describe Hackpad::Cli::Runner do
     end
   end
 
+  it 'calls the add method in client class' do
+    Object.stub(:add)
+    cli.shell.mute do
+      cli.add
+    end
+  end
+
   it 'calls the workspaces method in client class' do
     Object.stub(:workspaces)
     cli.shell.mute do
@@ -55,7 +62,8 @@ describe Hackpad::Cli::Runner do
   end
 
   it 'calls the version method in client class' do
-    STDOUT.stub(:puts).with(Hackpad::Cli::VERSION)
+    version = File.read(File.expand_path('../../../../../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
+    STDOUT.stub(:puts).with(version)
     cli.shell.mute do
       cli.version
     end

data/spec/lib/hackpad/cli/store_spec.rb

@@ -3,19 +3,18 @@
 require 'spec_helper'
 require 'hackpad/cli/store'
 require 'hackpad/cli/pad'
+require 'hackpad/cli/config'
+require 'hackpad/cli/workspace'
 
 describe Hackpad::Cli::Store do
 
   let(:configdir) { File.expand_path('../../../../files', __FILE__) }
-  let(:options) { OpenStruct.new(
-      configdir: configdir,
-      workspace: 'default',
-      workspacedir: File.join(configdir, 'default')
-      )
-    }
+  let(:workspacedir) { File.expand_path('../../../../files/default', __FILE__) }
+  let(:config) { OpenStruct.new(basedir: configdir, refresh: false, workspace: 'default') }
+  let(:workspace) { OpenStruct.new(basedir: workspacedir) }
 
   before :each do
-    subject.prepare options
+    subject.prepare config, workspace
   end
 
   describe '.read_list' do
@@ -41,7 +40,7 @@ describe Hackpad::Cli::Store do
           )
         }
       before do
-        subject.prepare options
+        subject.prepare options, workspace
         FileUtils.touch File.join(configdir, 'default', 'pads', 'txt', 'xxx')
       end
       after { FileUtils.rm File.join(configdir, 'default', 'pads', 'txt', 'xxx') }
@@ -65,11 +64,10 @@ describe Hackpad::Cli::Store do
   describe '.save' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'txt', 'xxx') }
     let(:content) { "This is content\n" }
-    before { subject.prepare options }
     let(:pad) { double Hackpad::Cli::Pad }
     before { pad.stub(:id).and_return 'xxx' }
     before { pad.stub(:content).and_return content }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
     it do
       subject.save pad, 'txt'
       expect(File.read(padfile)).to eq content
@@ -79,8 +77,7 @@ describe Hackpad::Cli::Store do
   describe '.save_options' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'meta', 'xxx') }
     let(:content) { { thing: '123', other: 'option' } }
-    before { subject.prepare options }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
     it do
       subject.save_options 'xxx', content
       expect(File.read(padfile)).to eq "{\n  \"thing\": \"123\",\n  \"other\": \"option\"\n}\n"
@@ -90,8 +87,7 @@ describe Hackpad::Cli::Store do
   describe '.save_list' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'padlist') }
     let(:pads) { [OpenStruct.new(id: '123', cached_at: 'some time', title: 'title1')] }
-    before { subject.prepare options }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
     it do
       subject.save_list pads
       expect(File.read(padfile)).to eq "123 [some time] title1\n"
@@ -101,12 +97,11 @@ describe Hackpad::Cli::Store do
   describe '.read' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'txt', 'xxx') }
     let(:content) { "This is content\n" }
-    before { subject.prepare options }
     let(:pad) { double Hackpad::Cli::Pad }
     before { pad.stub(:id).and_return 'xxx' }
     before { pad.stub(:content).and_return content }
     before { subject.save pad, 'txt' }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
 
     it { expect(subject.read 'xxx', 'txt').to eq content }
   end
@@ -114,18 +109,16 @@ describe Hackpad::Cli::Store do
   describe '.read_option' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'meta', 'xxx') }
     let(:content) { { 'thing' => '123', 'other' => 'option' } }
-    before { subject.prepare options }
     before { subject.save_options 'xxx', content }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
     it { expect(subject.read_options 'xxx').to eq content }
   end
 
   describe '.count_pads' do
     let(:padfile) { File.join(configdir, 'default', 'pads', 'meta', 'xxx') }
     let(:content) { { 'thing' => '123', 'other' => 'option' } }
-    before { subject.prepare options }
     before { subject.save_options 'xxx', content }
-    after { FileUtils.rm padfile }
+    after { FileUtils.rm padfile if File.exist?(padfile) }
     it { expect(subject.count_pads).to be 1 }
   end
 
@@ -133,12 +126,11 @@ describe Hackpad::Cli::Store do
     let(:timestamp) { Time.new(2012, 10, 31) }
     let(:padlist) { File.join(configdir, 'default', 'pads', 'padlist') }
     let(:pads) { [OpenStruct.new(id: '123', cached_at: 'some time', title: 'title1')] }
-    before { subject.prepare options }
     before do
       subject.save_list pads
       FileUtils.touch padlist, mtime: timestamp
     end
-    after { FileUtils.rm padlist }
+    after { FileUtils.rm padlist if File.exist?(padlist) }
     it { expect(subject.last_refresh).to eq timestamp }
   end
 

data/spec/lib/hackpad/cli/workspace_spec.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'hackpad/cli/workspace'
+
+describe Hackpad::Cli::Workspace do
+
+  let(:configdir) { File.expand_path('../../../../files', __FILE__) }
+  let(:workspacedir) { File.join(configdir, 'default') }
+  let(:workspacedir) { File.join(configdir, 'default') }
+  let(:workspacefile) { File.join(workspacedir, 'config.yml') }
+  let(:options) { { basedir: workspacedir, basefile: workspacefile } }
+  let(:input) { StringIO.new }
+  let(:output) { StringIO.new }
+
+  before { FileUtils.mkdir_p configdir unless Dir.exist?(configdir) }
+  before { FileUtils.mkdir_p workspacedir unless Dir.exist?(workspacedir) }
+
+  after { FileUtils.rm workspacefile if File.exist?(workspacefile) }
+
+  describe '.new' do
+    context 'when there is already config files created,' do
+      let(:workspacevars) { { 'client_id' => '123', 'secret' => 'toto', 'site' => 'http://example.com' } }
+      before { File.open(workspacefile, 'w') { |f| f.puts YAML.dump(workspacevars) } }
+      let(:workspace) { Hackpad::Cli::Workspace.new(options) }
+      it {
+        expect(workspace.secret).to eq 'toto'
+        expect(workspace.site).to eq 'http://example.com'
+      }
+    end
+    context 'when there is no config files created,' do
+      before { input.stub(:gets).and_return('123', 'toto', 'http://example.com') }
+      let(:workspace) { Hackpad::Cli::Workspace.new(options, input, output) }
+      it {
+        expect(workspace.secret).to eq 'toto'
+        expect(workspace.site).to eq 'http://example.com'
+      }
+    end
+  end
+
+  describe '.create' do
+    let(:workspacevars) { { 'client_id' => '123', 'secret' => 'toto', 'site' => 'http://example.com' } }
+    before { File.open(workspacefile, 'w') { |f| f.puts YAML.dump(workspacevars) } }
+    let!(:workspace) { Hackpad::Cli::Workspace.new(options, input, output) }
+    let(:newone) { 'another' }
+    let(:newworkspacefile) { File.join(configdir, newone, 'config.yml') }
+    before { input.stub(:gets).and_return(newone, '123', 'toto', 'http://example.com') }
+    after { FileUtils.rm newworkspacefile if File.exist?(newworkspacefile) }
+    it {
+      workspace.create
+      expect(File.exist? newworkspacefile).to be true
+    }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackpad-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,20 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: configstruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: cliprompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +207,10 @@ files:
 - lib/hackpad/cli/padlist.rb
 - lib/hackpad/cli/runner.rb
 - lib/hackpad/cli/store.rb
-- lib/hackpad/cli/version.rb
+- lib/hackpad/cli/workspace.rb
+- lib/reverse_markdown/converters/head.rb
+- spec/files/test/sample.html
+- spec/files/test/sample.md
 - spec/lib/hackpad/cli/api_spec.rb
 - spec/lib/hackpad/cli/client_spec.rb
 - spec/lib/hackpad/cli/config_spec.rb
@@ -201,6 +218,7 @@ files:
 - spec/lib/hackpad/cli/padlist_spec.rb
 - spec/lib/hackpad/cli/runner_spec.rb
 - spec/lib/hackpad/cli/store_spec.rb
+- spec/lib/hackpad/cli/workspace_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mose/hackpad-cli
 licenses:
@@ -222,11 +240,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: CLI for hackpad browsing and editing.
 test_files:
+- spec/files/test/sample.html
+- spec/files/test/sample.md
 - spec/lib/hackpad/cli/api_spec.rb
 - spec/lib/hackpad/cli/client_spec.rb
 - spec/lib/hackpad/cli/config_spec.rb
@@ -234,4 +254,5 @@ test_files:
 - spec/lib/hackpad/cli/padlist_spec.rb
 - spec/lib/hackpad/cli/runner_spec.rb
 - spec/lib/hackpad/cli/store_spec.rb
+- spec/lib/hackpad/cli/workspace_spec.rb
 - spec/spec_helper.rb

data/lib/hackpad/cli/version.rb

@@ -1,5 +0,0 @@
-module Hackpad
-  module Cli
-    VERSION = '0.1.2'
-  end
-end