laadur 1.0.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e5a296dde73b92f69d328b943a5bcac468d4a9
-  data.tar.gz: 1ff473f2c9f046542e4ef48ea3eb05854506ab6c
+  metadata.gz: 5d107aebb2b1247f7ff2874b4e5c2e52ca52e18d
+  data.tar.gz: aae0f83d091ec84bd389d13187f687d79db26023
 SHA512:
-  metadata.gz: e40fec48cdd196a4285c1f7883413c91419ee50f28cfe6d9a01f387d653e805b038a02f41f0779ab6b2d34f0bc32bf5bb3c85a117507bd1c13f60ae6e337b642
-  data.tar.gz: f3a19845fe7e9821143651e2277d9f01ee1a091b39d85fa53ae7b2c9fd13b405621d9e79deea02c182b454002925fe6ec201e5b2242a0e316de83924b0a636c5
+  metadata.gz: c98773fe172829fa16ee54b7c6da17d8412d7801eeec71dbaeb0a5b42770193a47cbb6920c766b8cac8562c7b445e513ea5cdea44e64f9f1b2861aec24c1dd20
+  data.tar.gz: 70ef15ad24e2d04ba9746a4e1d8065e0682e7ef3311664c74cf71b81dda0d2c97dc633f4917cbe1c00b0a94e05262571be12c924a2bc57617f982e3ae370f5d8

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in laadur.gemspec
-gemspec
-gem "version"
+gemspec

data/README.md

@@ -0,0 +1,113 @@
+# laadur (CLI)
+
+## Intro
+When you are doing routine work, you may need a tool which will simplify your workflow.  
+So became **laadur**.
+
+Laadur creates a folder in your homepath (/Users/{user}/.laadur) and keeps there your templates.  
+**Now it works via CLI. So, it can't be required in your project or smth else. Yet.**
+
+## Using
+[Installation](#installation)  
+[Managing](#managing)  
+[Search](#search)  
+[Targetting](#targetting)  
+[Multiloading](#multiloading)  
+[Debugging](#debugging)  
+
+#### Installation
+```sh
+gem install laadur
+```
+So, now you are ready.  
+To create your first template, you can use
+```sh
+laadur -o
+```
+which will open your **laadur** folder with finder.  
+
+Simply create several folders there with some content.
+For example, folders like:
+![Folder structure example](http://d1zjcuqflbd5k.cloudfront.net/files/acc_127427/Rqjt?response-content-disposition=inline;%20filename=Screen%20Shot%202013-10-29%20at%2012.24.34%20PM.png;%20filename*=UTF-8%27%27Screen%20Shot%202013-10-29%20at%2012.24.34%20PM.png&Expires=1383042517&Signature=Gun9Ejh5oAcvkZMFclne-84ATu4xa9Pu1Yh4tJOnCKBw8pOTYfD2pCHMfEr7uDMDFuIxaHBt15WlcDnMjHhZeA1MNHnlK2D1dDqSldgWf7YOpgYe3ImiM3q8XiDdukyLxjpcE-kaSxkBu5kuZxAU5fuk4pTOv4o8V8WEzavhjsI_&Key-Pair-Id=APKAJTEIOJM3LSMN33SA)  
+Here you go.  
+Now you can get this templates from wherever you are.
+
+Simply use:
+```sh
+[ ~ ]: cd blog
+[ ~/blog ]: laadur -l bootstrap
+```
+It will load the content of `bootstrap` folder to your present working directory (pwd).  
+
+#### Managing
+You can remotely get access to some laadur data.  
+Get laadur folder path: `laadur --folder`.  
+Get list of all templates: `laadur --list`.  
+And remove certain template: `laadur -r bootstrap`.   
+
+#### Search
+Laadur can load several templates, using regular expression.
+```sh
+[ ~/blog ]: laadur --list
+There are 4 templates:
+├ jquery
+├ jquery-mobile
+├ sass-mixins
+└ sass-mixins-mobile
+[ ~/blog ]: laadur -s *-mobile
+jquery-mobile loaded!
+sass-mixins-mobile loaded!
+```
+You can also load all templates using `--all`.
+
+#### Targetting
+By default laadur loads files to your pwd.  
+If you wanna change destination folder, use `-t`/`--target`.  
+##### _In version 1.0 you should specify **target** before specifying template!_
+Look:
+```sh
+[ ~ ]: cd blog
+[ ~/blog ]: laadur -t assets -l bootstrap
+```
+Laadur will copy the content from `.laadur/bootstrap` and paste it to the `~/blog/assets` folder. If folder doesn't exist, it will create it for you. 
+If you need to choose destination folder not from pwd, you can set `--home` option, and laadur will search target folder from your home directory. 
+For example:
+```sh
+[ ~/blog/assets/img/png/16x16 ]: laadur --home -t blog/assets -l bootstrap
+```
+
+#### Multiloading
+Multiloading is disabled in the actual version, but you still can use it but in a little different way.
+```sh
+[ ~/blog ]: laadur -l bootstrap/css -l bootstrap/js
+```
+
+#### Debugging
+If you are not sure, you can first check, where your files will be loaded to:
+```sh
+[ ~/blog ]: laadur --home -t another/path --prt
+```
+It will acts as you're going to copy.  
+But `--prt` option will simply print destination path instead of copying files. 
+### Options
+```
+-v, --version                    show version
+-h, --help                       help window
+    --docs                       open github documentation page
+
+-o, --open                       open laadur folder with Finder.app
+    --list                       list all templates
+    --folder                     print folder path
+
+-t, --target <path>              specify target folder for copying template files (also see --home)
+    --home                       use home folder as root for target option (pwd by default)
+    --pwd                        return back home as pwd (useful with multiloading)
+    --prt                        print target path (where files will be copied)
+
+-s, --search <expr>              search templates with regex
+    --all                        load all templates
+
+-l, --load <template>            load template from repository
+                                 you may not specify this flag
+-r, --remove <template>          remove a certain template
+```

data/Rakefile

@@ -1,12 +1,8 @@
 require 'bundler/gem_tasks'
-require 'version'
 
 task :deploy, :arg1 do |t, args|
   `rake install`
   `git add -A`
-  v = File.read("version").to_version
-  v.bump!
-  File.open('version', 'w') { |file| file.write(v.to_s) }
   `git commit -m '#{args.arg1}'`
   `git push`
 end

data/TODO

@@ -0,0 +1,4 @@
+v2.0:
+  * collect options -> parse –> run (instead of parse->run in v1.0)
+  * --combine
+  * --force

data/bin/laadur

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'laadur'
-ch = Laadur::CLI.new
+Laadur::CLI.new

data/laadur.gemspec

@@ -6,10 +6,10 @@ include Laadur
 
 Gem::Specification.new do |spec|
   spec.name          = "laadur"
-  spec.version       = Laadur.VERSION
+  spec.version       = Laadur::VERSION
   spec.authors       = ["Nikita Nikitin"]
   spec.email         = ["berozzy@gmail.com"]
-  spec.description   = "Helps to simplify workflow"
+  spec.description   = "Template manager with CLI"
   spec.summary       = ""
   spec.homepage      = "http://github.com/rozzy/laadur"
   spec.license       = "MIT"

data/lib/laadur.rb

@@ -12,141 +12,95 @@ module Laadur
       @@workpath = Dir.pwd
       puts "Your laadur folder is empty.\n\n" if Dir[File.join(@@home, '**', '*')].count { |dir| File.directory?(dir) } == 0
       begin
-        error_flag ||= false
-        @use_home = false
-        @parsed_tmpl = false
-        @used_target = false
-        @target = @@workpath
-        options = {}
-        loaded = []
-        reserved = ['-s', '--search', '--all', '-v', '--version', '-h', '--help', '--docs', '-o', '--open', '-l', '--list', '--folder', '-t', '--target', '--home', '--pwd', '--prt', '-r', '--remove']
+        @@multiloading = false
+        @error_flag || @use_home = @parsed_tmpl = @used_target = false
+        @target, options, loaded = @@workpath, {}, []
         begin
-        OptionParser.new do |opts|
-          opts.banner = "Usage: laadur [options]"
-
-          opts.on("-v", "--version", "show version") do
-            puts version
-          end
-
-          opts.on("-h", "--help", "help window") do
-            puts opts
-          end
+        parse_options
+        rescue => error
+          puts error.to_s.slice(0,1).capitalize + error.to_s.slice(1..-1)
+        end 
+      rescue OptionParser::InvalidOption => error
+        puts error.to_s
+        @error_flag = true
+        retry
+      end
+    end
 
-          opts.on("--docs", "open github documentation page") do
-            `open https://github.com/rozzy/laadur`
-          end
+    def parse_options
+      OptionParser.new do |opts|
+          opts.banner = "Usage: laadur [options]"
+          opts.on("-v", "--version", "print gem version") do puts Laadur::VERSION end
+          opts.on("-h", "--help", "help window") do puts opts end
+          opts.on("--docs", "open github documentation page") do `open https://github.com/rozzy/laadur` end
 
           opts.separator ""
 
-          opts.on("-o", "--open", "open laadur folder with Finder.app") do
-            `open #{@@home}`
-          end
+          opts.on("-o", "--open", "open laadur folder with Finder.app") do `open #{@@home}` end
+          opts.on("-l", "--list", "list all templates") do list end
+          opts.on("--folder", "print folder path") do puts @@home end
 
-          opts.on("-l", "--list", "list all templates") do
-            files = Dir.glob("#{@@home}/*").select {|f| File.directory? f}
-            if files.size > 0
-              puts "There #{files.size == 1 ? 'is' : 'are'} #{files.size} #{files.size == 1 ? 'template' : 'templates'}:"
-              last = Pathname.new(files.last).basename
-              files.pop
-              files.each do |file|
-                puts "├ #{b Pathname.new(file).basename}"
-              end
-              puts "└ #{b last}"
-            else
-              puts "Your laadur folder is empty!"
-            end
-          end
+          opts.separator ""
 
-          opts.on("--folder", "print folder path") do
-            puts @@home
-          end
+          opts.on("-t", "--target <path>", "specify target folder for copying template files (also see --home)") do |target| set_target target end
+          opts.on("--home", "use home folder as root for target option (pwd by default)") do use_home end
+          opts.on("--pwd", "return back home as pwd (useful with multiloading)") do return_pwd end
+          opts.on("--prt", "print target path (where files will be copied)") do puts "Files will be copied to: #{@target}" end
 
           opts.separator ""
 
-          opts.on("-t", "--target <path>", "specify target folder for copying template files (also see --home)") do |target|
-            raise "Next time use --target before specifying the template." if @parsed_tmpl
-            @target = @use_home ? "#{Dir.home}/#{target}" : "#{@@workpath}/#{target}"
-            begin
-              puts "Trying to set target to #{@target}, but there is no such folder."
-              Dir.mkdir @target
-              puts "So #{@target} was created."
-              @used_target = true
-            end if not File.directory? @target
-          end
-
-          opts.on("--home", "use home folder as root for target option (pwd by default)") do
-            raise "Next time use --home before specifying the target." if @used_target
-            puts "Using #{Dir.home}/ as root."
-            @target = Dir.home
-            @use_home = true
-          end
-          
-          opts.on("--pwd", "return back home as pwd (useful with multiloading)") do
-            puts "Using #{@@workpath}/ as root."
-            @target = @@workpath
-            @use_home = true
-          end
-          
-          opts.on("--prt", "print target path (where files will be copied)") do
-            puts "Files will be copied to: #{@target}"
-          end
+          opts.on("-s", "--search <expr>", "search templates with regex") do |expr| load_regex expr end
+          opts.on("--all", "load all templates") do load_regex "*" end
 
           opts.separator ""
 
-          opts.on("-s", "--search <expr>", "search templates with regex") do |expr|
-            puts "searching with #{expr}"
-          end
+          opts.on("load template from repository", "-l", "--load <template>", "you may not specify this flag") do |template| self.parse_template template end
+          opts.on("-r", "--remove <template>", "remove a certain template") do |template| self.remove_template template end
 
-          opts.on("--all", "load all templates") do
-            puts "loading all"
-          end
+          print_message if ARGV.size == 0
+          
+          parse_multiple_args if ARGV.size > 1 and @@multiloading
 
-          opts.separator ""
+          puts opts if @error_flag or ARGV.size == 0
+        end.parse!
+    end
 
-          opts.on("load template from repository", "-l", "--load <template>", "you may not specify this flag") do |template| 
-           self.parse_template template
-          end
+    def set_target target
+      raise "Next time use --target before specifying the template." if @parsed_tmpl
+      @target = @use_home ? "#{Dir.home}/#{target}" : "#{@@workpath}/#{target}"
+      begin
+        puts "Trying to set target to #{@target}, but there is no such folder."
+        Dir.mkdir @target
+        puts "So #{@target} was created."
+        @used_target = true
+      end if not File.directory? @target
+    end
 
-          opts.on("-r", "--remove <template>", "remove a certain template") do |template|
-            self.remove_template template
-          end
-          
-          if ARGV.size == 0
-            File.foreach('laadur.txt') do |line|
-              match = line.match /\#\{(.*)\}/
-              line = line.gsub /\#\{(.*)\}/, instance_eval("#{match[1]}") if match
-              puts line
-            end
-            puts ""
-          end
+    def return_pwd
+      puts "Using #{@@workpath}/ as root."
+      @target = @@workpath
+      @use_home = true
+    end
 
-          # if ARGV.size > 0
-          #   ARGV.each do |template|
-          #     if template.match /^--|-/ and reserved.include? template
-          #       if self.template? template
-          #         puts "There is option with name #{b template} and a path #{@@home}/#{b template}."
-          #         puts "I think this is option. If you want use it as path, load it like this: /../.laadur/#{b template}. Sorry :-("
-          #         puts ""
-          #         puts opts
-          #         puts ""
-          #       end
-          #       next
-          #     end
-
-          #     self.parse_template template if self.template? template
-          #   end
-          # end
-
-          puts opts if error_flag or ARGV.size == 0
+    def use_home
+      raise "Next time use --home before specifying the target." if @used_target
+      puts "Using #{Dir.home}/ as root."
+      @target = Dir.home
+      @use_home = true
+    end
 
-        end.parse!
-        rescue => error
-          puts error.to_s.slice(0,1).capitalize + error.to_s.slice(1..-1)
+    def list
+      files = Dir.glob("#{@@home}/*").select {|f| File.directory? f}
+      if files.size > 0
+        puts "There #{files.size == 1 ? 'is' : 'are'} #{files.size} #{files.size == 1 ? 'template' : 'templates'}:"
+        last = Pathname.new(files.last).basename
+        files.pop
+        files.each do |file|
+          puts "├ #{b Pathname.new(file).basename}"
         end
-      rescue OptionParser::InvalidOption => error
-        puts error.to_s
-        error_flag = true
-        retry
+        puts "└ #{b last}"
+      else
+        puts "Your laadur folder is empty!"
       end
     end
 
@@ -159,8 +113,13 @@ module Laadur
       FileUtils.cp_r "#{@@home}/#{template}/.", @target
       puts "#{b template} loaded!"
     end
-    
-    def version; File.read "version"; end
+
+    def load_regex expr
+      l = Dir.glob("#{@@home}/#{expr}").select { |f| self.template? Pathname.new(f).basename }
+      l.each do |template|
+        parse_template Pathname.new(template).basename
+      end
+    end
 
     def b(text) "#{`tput bold`}#{text}#{`tput sgr0`}"; end
 
@@ -174,5 +133,30 @@ module Laadur
         puts "There is no template with such name."
       end
     end
+
+    def print_message
+      puts "Laadur #{Laadur::VERSION}\n"+
+        "============\n" +
+        "Documentation: github.com/rozzy/laadur\n" +
+        "Written by Rozzy (github.com/rozzy) for you.\n" +
+        "Thanks for using.\n"
+    end
+
+    def parse_multiple_args
+      ARGV.each do |template|
+        if template.match /^--|-/
+          if self.template? template
+            puts "There is option with name #{b template} and a path #{@@home}/#{b template}."
+            puts "I think this is option. If you want use it as path, load it like this: /../.laadur/#{b template}. Sorry :-("
+            puts ""
+            puts opts
+            puts ""
+          end
+          next
+        end
+
+        self.parse_template template if self.template? template
+      end
+    end
   end
 end

data/lib/laadur/version.rb

@@ -1,5 +1,3 @@
 module Laadur
-  def VERSION 
-    File.read "version"
-  end
+  VERSION = '1.3.1'
 end

data/lib/version

@@ -0,0 +1 @@
+1.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laadur
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Nikita Nikitin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Helps to simplify workflow
+description: Template manager with CLI
 email:
 - berozzy@gmail.com
 executables:
@@ -49,14 +49,14 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README
+- README.md
 - Rakefile
+- TODO
 - bin/laadur
 - laadur.gemspec
-- laadur.txt
 - lib/laadur.rb
 - lib/laadur/version.rb
-- version
+- lib/version
 homepage: http://github.com/rozzy/laadur
 licenses:
 - MIT

data/README

@@ -1,3 +0,0 @@
-laadur
-===
-helps to manage workflow

data/laadur.txt

@@ -1,5 +0,0 @@
-Laadur #{version}
-============
-Documentation: github.com/rozzy/laadur
-Written by Rozzy (github.com/rozzy) for you.
-Thanks for using.

data/version

@@ -1 +0,0 @@
-1.0.1