diglossa 0.2.23 → 0.2.24

data/README.md

@@ -35,6 +35,26 @@ texts (paragraphs):
     dg pushtexts [PATH]          # parse texts for root PATH, ex: dg docs "NT/Palama/Triads"
 
 
+## .couchapprc
+
+Do not forget to generate .couchapprc file with <tt>dg gen your_appname</tt> and fill in your CouchDB credentials.
+
+<tt> {
+  "env": {
+    "default": {
+      "db": "http://admin:password@localhost:5984/diglossa"
+    },
+    "production": {
+      "db": "http://admin:password@diglossa.ru:5984/diglossa"
+    }
+  },
+    "data": "~/web/diglossa.data",
+    "seeds": "~/web/socadimo/diglossa.blog",
+    "locales": ["ru", "en"]
+}
+</tt>
+
+
 
 ## ToDo
 

data/diglossa.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency(%q<json>, ["~> 1.7.5"])
   gem.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
-  gem.add_runtime_dependency(%q<typhoeus>, ["~> 0.6.3"])
+  #gem.add_runtime_dependency(%q<typhoeus>, ["~> 0.6.3"])
   gem.add_runtime_dependency(%q<rest-client>)
   gem.add_runtime_dependency(%q<thor>, ["~> 0.15"])
   #gem.add_runtime_dependency(%q<thor>, ["~> 0.15"])

data/lib/diglossa/cli.rb

@@ -4,7 +4,7 @@ require 'thor/actions'
 require 'uuidtools'
 #require 'typhoeus'
 require 'rest_client'
-#require 'yaml'
+require 'yaml'
 require 'pp'
 #require 'redcarpet'
 

data/lib/diglossa/parse.rb

@@ -24,16 +24,15 @@ module Diglossa
       doc
     end
 
-
     def build root, push=false
-      # FIXME: Lib to .diglossarc
-      fn = File.expand_path(File.join(Diglossa::Lib, root))
+      remote = Diglossa::Remote.new(app_dir)
+      data_dir = remote.config["data"]
+      #puts "locales #{remote.config["locales"]}"
+      fn = File.expand_path(File.join(data_dir, root))
       fullname = File.exist?("#{fn}.json") ? "#{fn}.json" : File.exist?("#{fn}.yml") ? "#{fn}.yml" : false
       return nil unless fullname
       doc = fullname ? YAML.load_file(fullname) : "no .json or .yml file at #{root}"
       @nics = doc["authors"]
-      remote = Diglossa::Remote.new(app_dir)
-      #puts "locales #{remote.config["locales"]}"
       @rpp = {}
       @dbauthors = remote.author(doc["authors"])
       @author_nic = root.split("/")[1].downcase
@@ -68,7 +67,8 @@ module Diglossa
 
     def parallels path, push = false
       remote = Diglossa::Remote.new(app_dir)
-      dpath = File.expand_path(File.join(Diglossa::Lib, path))
+      data_dir = remote.config["data"]
+      dpath = File.expand_path(File.join(data_dir, path))
       return if File.directory?(dpath)
       @counter = []
       docs = []

data/lib/diglossa/remote.rb

@@ -9,8 +9,7 @@ module Diglossa
       self.app_dir     = File.expand_path(app_dir) + '/'
       #self.config_path = config_path
       #load_config
-      #load_couchapprc
-      load_diglossarc
+      load_couchapprc
     end
 
     # def config_path=(config_path)
@@ -25,7 +24,7 @@ module Diglossa
     #   end
     # end
 
-    def load_diglossarc
+    def load_couchapprc
       # тут есть теперь "data-dir", но она нужна в parse, а не здесь. Как загружать один раз эту хрень?
       @config ||= {}
       @config = JSON.parse(File.read(File.join(app_dir, '.couchapprc')))

data/lib/diglossa/templates/couchapprc.erb

@@ -4,7 +4,9 @@
       "db": "http://admin:admin@localhost:5984/<%= appname %>"
     },
     "production": {
-      "db": "http://admin:admin@localhost:5984/<%= appname %>"
+      "db": "http://admin:admin@diglossa.ru:5984/<%= appname %>"
     }
-  }
+  },
+    "data": "~/web/diglossa.data", 
+    "locales": ["ru", "en"]
 }

data/lib/diglossa/version.rb

@@ -1,4 +1,3 @@
 module Diglossa
-  VERSION = "0.2.23"
-  Lib = "~/web/diglossa.data"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diglossa
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -107,22 +107,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement