DataMgr 0.1.1.1.pre → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dbac8cd85c6be82abd3eb4bdd123106217b1977
-  data.tar.gz: 75ed3af46d91f8cc1fcdf845f05656e74f1bd453
+  metadata.gz: 2854606538cea24237e00b8ee35155cb3dcdc977
+  data.tar.gz: 6c379a4ddb9a6e77953866dfd5d2408763279a26
 SHA512:
-  metadata.gz: d2f486c8859c5df8aa5c162428b2bdf964e4c2c0a08feea2855e80e0e138bb51c29e7439320ec43230b51ef2970f44d1a97797c537586657861b264a0fd37548
-  data.tar.gz: 13f0e524e024a22946f9acca7b7da8eb33a3a808081658a464f477de8fadb38cdd615f117ccaf0159daede94234a643a67c881116af805e1bd9b3c684b0ee0bf
+  metadata.gz: 5d0c3f600915c9ad34e2d656b7e43795dd9913069691b4b3f2cc6ef889fb89aeb292169a986c7e8f6cb4aae3fdf5f9b065d62ad7cad06e10e89ec4b2f23b401f
+  data.tar.gz: 74eeb52a6d38e76d383dfe26a476f60e4493b65094d101817a9b4178503edf30b7eff18128271cb740e9ce643b076fa0c1f191cc7fc2cac531431a897937f4cb

data/.gitignore

@@ -1,5 +1,5 @@
 /.bundle/
-/.idea/
+/.idea
 /.yardoc
 /Gemfile.lock
 /_yardoc/

data/DataMgr.gemspec

@@ -31,5 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "json", ">= 1.8.3"
-  spec.add_development_dependency "tiny_tds"
 end

data/README.md

@@ -1,10 +1,18 @@
 # DataMgr
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/DataMgr`. To experiment with that code, run `bin/console` for an interactive prompt.
+Data manager that provides support for JSON, YAML, and Database (e.g .SQL Server) dataware.  Provides
+the ability to manage the state of your data - creation, retrieve, and execute (SQL), then manage
+those results for re-use later .. in your automation framework, app. code, etc.
+
+Put your Ruby code in the file `lib/DataMgr`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 
 ## Installation
 
+### Prerequisite
+
+http://stackoverflow.com/questions/33102569/installing-tiny-tds-gives-error-on-on-mac-os-10-10-5
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -21,7 +29,21 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Creating a connection configuration YAML file
+
+        MyConnectID:
+          user: sasquatch
+          password: kale
+          host: somewhere-in-the-woods.com
+          port: 2080
+          description: Big Foot
+        ---
+        AnotherConnectID:
+          user: bigbird
+          password: yellow
+          host: sesame-street
+          port: 2080
+          description: Sesame Street Gang
 
 ## Development
 

data/lib/DataMgr/DB/db.rb

@@ -4,105 +4,35 @@
 #
 require 'singleton'
 require 'yaml'
-require 'tiny_tds'
 
 module DataMgr
 
+  class DBConnectionError < StandardError
+    def initialize(msg="Connect - Unsupported.  Install pre-release for DB support (e.g. gem install DataMgr --pre)")
+      super
+    end
+  end
+
   class DB
     include Singleton
 
     attr_accessor :clients
     attr_accessor :config
-    attr_accessor :debug
 
     def initialize
       @clients={}
-      @debug=false
     end
 
     def close(_id)
-      rc=disconnect(_id)
-      puts "close(#{_id}): #{rc}" if @debug
-      rc
-    end
-
-    def _execute(c, q)
-
-      begin
-        if c.active?
-          puts "execute(#{q} ..." if @debug
-          rc=c.execute(q)
-
-          puts "rc : #{rc.class} : #{rc}"
-
-          h={}
-
-          if rc.is_a?(TinyTds::Result)
-            rc.each_with_index do |row, i|
-
-              h[i]=row
-
-              puts "#{i}. #{row.class} : #{row}" if @debug
-            end
-          end
-
-          rc=h.to_yaml
-          puts h.to_yaml
-        end
-      rescue => ex
-        ;
-      end
-
-      puts "_execute(c, #{q}): #{h}" if @debug
-      h
-    end
-
-
-    def run(_id, q)
-      rc=nil
-      puts "run(#{_id}, #{q})" if @debug
-
-      begin
-        if @clients.has_key?(_id)
-
-          if @clients[_id].active?
-            puts "=> active" if @debug
-
-            rc=_execute(@clients[_id], q)
-          else
-            puts "warning: connection #{_id} is not active." if @debug
-          end
-        else
-
-          puts "run(#{_id}, #{q}) : WARN - not connected."
-          _c = getConfig(_id)
-          if !_c.nil? && _c.connect(_id)
-            if _c.active?
-              rc=_execute(@clients[_id], q)
-            end
-          end
-
-        end
-      rescue => ex
-        puts "Exception: #{ex.class}"
-        puts ex.backtrace
-      end
-      rc
+      disconnect(_id)
     end
 
     def disconnect(_id)
       rc=false
-      begin
-        if @clients.has_key?(_id)
-          @clients[_id].close
-          rc=true
-        end
-      rescue => ex
-        puts "Exception: #{ex.class}"
-        puts ex.backtrace
+      if @clients.has_key?(_id)
+        @clients[_id].close
+        rc=true
       end
-
-      puts "disconnect(#{_id}): #{rc}" if @debug
       rc
     end
 
@@ -110,40 +40,40 @@ module DataMgr
     def connect(_id)
       rc=false
       begin
-        conn=getConfig(_id)
+        conn=get(_id)
 
         if !conn.nil?
 
-          puts ".. connect(#{_id}) ..." if @debug
+          raise DBConnectionError
 
-          @clients[_id] = TinyTds::Client.new username: conn['user'],
-                                       password: conn['password'],
-                                       host: conn['host'],
-                                       port: conn['port']
-          rc=@clients[_id].active?
+          #@clients[_id] = TinyTds::Client.new username: conn['user'],
+          #                             password: conn['password'],
+          #                             host: conn['host'],
+          #                             port: conn['port']
+          #rc=true if @clients[_id].active?
         else
           puts __FILE__ + (__LINE__).to_s + " WARN: client #{_id} is not defined."
         end
 
+      rescue DBConnectionError => ex
+        raise ex
+
       rescue => ex
         ;
       end
 
-      puts "connect(#{_id}) : #{rc}" if @debug
       rc
     end
 
 
-    def getConfig(_id)
+    def get(_id)
       @config.each do |_c|
+        puts __FILE__ + (__LINE__).to_s + " get => #{_c}"
         if _c.has_key?(_id)
-          puts __FILE__ + (__LINE__).to_s + " get(#{_id}) => #{_c[_id]}" if @debug
           return _c[_id]
         end
       end
 
-      puts "get(#{_id}) => not found. (nil)"
-
       nil
     end
 
@@ -157,10 +87,9 @@ module DataMgr
         puts __FILE__ + (__LINE__).to_s + " #{ex.class}: Invalid file: #{_config} - abort processing."
         puts ex.backtrace
       end
-
-      puts "load(#{_config}): #{rc}" if @debug
       rc
     end
+
   end
 
 

data/lib/DataMgr/DSL/dsl.rb

@@ -0,0 +1,70 @@
+
+require 'singleton'
+
+module DataMgr
+
+  class DSL
+    include Singleton
+
+    def initialize()
+
+    end
+
+
+    # Ex.  './spec/fixtures/connect.yml'
+    def loadDB(_f)
+      DataMgr::DB.instance.load(_f)
+    end
+
+    def cmd(opts)
+#      puts "cmd => #{opts}"
+      rc=false
+      _cmd=nil
+
+      if opts.has_key?(:cmd)
+        _cmd=opts[:cmd]
+      else
+        return false
+      end
+
+      if _cmd.match(/^\s*loaddb\s*\(.*\)\s*$/i)
+        dbName = _cmd.match(/^\s*loaddb\s*\((.*)\)\s*$/i)[1].to_s
+        rc=DataMgr::DB.instance.load(dbName)
+
+      elsif opts.has_key?(:cmd) && opts[:cmd].match(/^\s*connect\s*\((.*)\)\s*$/)
+        _connectID = opts[:cmd].match(/^\s*connect\s*\((.*)\)\s*$/i)[1].to_s
+        rc=DataMgr::DB.instance.connect(_connectID)
+
+      elsif _cmd.match(/^\s*getDB\s*\(.*\)\.get\(.*\)\s*$/)
+        db = _cmd.match(/^\s*getDB\s*\(\s*(.*)\s*\)\.get\(.*\)\s*$/)[1].to_s
+#        puts "db => #{db}"
+#        rc = queries.getDataElement(hit)
+      else
+        STDERR.puts " Unknown command: #{opts}"
+      end
+
+
+      rc
+
+    end
+
+    def connect(id)
+      DataMgr::DB.instance.connect(id)
+    end
+
+
+    def loadData(_f)
+      DataMgr::DataModel.new(_f)
+    end
+
+
+
+
+
+
+  end
+
+
+
+
+end

data/lib/DataMgr/Model/data_model.rb

@@ -5,8 +5,10 @@ module DataMgr
   class DataModel
     attr_accessor :_file
     attr_accessor :app_model
+    attr_accessor :debug
 
     def initialize(f=nil)
+      @debug=false
 
       if !f.nil?
         @_file=f
@@ -20,13 +22,26 @@ module DataMgr
     end
 
     def saveAs(_fname, _json)
-      _f=File.open(_fname, 'w')
-      _f.puts _json.to_json
-      _f.close
+      rc=false
+      begin
+        _f=File.open(_fname, 'w')
+        _f.puts _json.to_json
+        _f.close
+        rc=true
+
+      rescue => ex
+        ;
+      end
+      rc
     end
 
+
     def loadPages(jlist)
 
+      if jlist.nil? || jlist.empty?
+        return nil
+      end
+
       json_list=[]
       if jlist.kind_of?(String)
         json_list << jlist
@@ -36,25 +51,44 @@ module DataMgr
 
       jsonData={}
       json_list.each  { |f|
-        puts __FILE__ + (__LINE__).to_s + " JSON.parse(#{f})"
 
         begin
-          data_hash = JSON.parse File.read(f)
-          jsonData.merge!(data_hash)
+
+          _fd=nil
+          _contents=nil
+          _ext=File.extname(f)
+
+          if _ext.match(/\.(yaml|yml|json|jsn)\s*$/i)
+            _fd = File.open(f, 'r')
+            _contents=_fd.read
+            _fd.close
+
+            _contents = JSON.dump(YAML::load(_contents)) if _ext.match(/(yaml|yml)/i)
+
+            if !_contents.nil?
+              data_hash = JSON.parse _contents
+              jsonData.merge!(data_hash)
+            end
+
+          end
+
         rescue JSON::ParserError
-          Scoutui::Logger::LogMgr.instance.fatal "raise JSON::ParseError - #{f.to_s}"
+          STDERR.puts " raise JSON::ParseError - #{f.to_s}"
           raise "JSONLoadError"
+
+        rescue => ex
+          STDERR.puts " Exception: #{ex.class}"
         end
 
       }
-      puts "merged jsonData => " + jsonData.to_json
+      puts "merged jsonData => " + jsonData.to_json  if @debug
       @app_model = jsonData
     end
 
 
     # getDataElement("data(address).get(city).get(zip)")
     def getDataElement(s)
-      puts __FILE__ + (__LINE__).to_s + " getDataElement(#{s})"
+      puts __FILE__ + (__LINE__).to_s + " getDataElement(#{s})" if @debug
 
       hit=@app_model
 
@@ -66,18 +100,18 @@ module DataMgr
         getter = elt.split(/\(/)[0]
         _obj = elt.match(/\((.*)\)/)[1]
 
-        puts __FILE__ + (__LINE__).to_s + " getter : #{getter}  obj: #{_obj}"
+        puts __FILE__ + (__LINE__).to_s + " getter : #{getter}  obj: #{_obj}" if @debug
 
         if getter.downcase.match(/^\s*(getData)\s*/i)
-          puts __FILE__ + (__LINE__).to_s + " -- process page --"
+          puts __FILE__ + (__LINE__).to_s + " -- process page --" if @debug
           hit=@app_model[_obj]
         elsif getter.downcase=='get'
           hit=hit[_obj]
         else
-          puts __FILE__ + (__LINE__).to_s + " getter : #{getter} is unknown."
+          puts __FILE__ + (__LINE__).to_s + " getter : #{getter} is unknown." if @debug
           return nil
         end
-        puts __FILE__ + (__LINE__).to_s + " HIT => #{hit}"
+        puts __FILE__ + (__LINE__).to_s + " HIT => #{hit}" if @debug
       }
 
       hit
@@ -93,20 +127,13 @@ module DataMgr
       if h.is_a?(Hash)
 
         h.each do |k, v|
-          puts __FILE__ + (__LINE__).to_s + " Key: #{k} => #{v}"
+          puts __FILE__ + (__LINE__).to_s + " Key: #{k} => #{v}" if @debug
           if k == condition
-            #  h[k].each {|k, v| result[k] = v } # <= tweak here
+
             if !v.is_a?(Array) && v.match(/^\s*#{_action}\s*\((.*)\)\s*$/i)
 
               dataObject=v.match(/^\s*#{_action}\s*\((.*)\)\s*$/i)[1]
 
-              puts __FILE__ + (__LINE__).to_s + " <pg, pageObject> : <#{pg}, #{dataObject}>"
-              #         result[k] = v
-
-              #          puts '*******************'
-              #          puts __FILE__ + (__LINE__).to_s + " HIT : #{h[k]}"
-              #          result << { h[k] => v }
-
               if pg.nil?
                 result << parent
               elsif pg == dataObject
@@ -117,15 +144,11 @@ module DataMgr
             elsif v.is_a?(Array)
 
               v.each do |vh|
-                puts " =====> #{vh}"
 
                 if vh.is_a?(Hash) && vh.has_key?(condition) && vh[condition].match(/^\s*#{_action}\s*/i)
 
                   pageObject=vh[condition].match(/^\s*#{_action}\s*\((.*)\)\s*$/i)[1]
 
-
-                  puts __FILE__ + (__LINE__).to_s + " matched on #{_action}, pg:#{pg}, #{pageObject}"
-
                   if pg.nil?
                     result << parent
                   elsif pg == pageObject
@@ -145,33 +168,20 @@ module DataMgr
               _rc = hits("#{parent}.get(#{k})", h[k], condition, _action, pg)
             end
 
-
             if !(_rc.nil? || _rc.empty?)
-
-
               result << _rc
-
-              puts __FILE__ + (__LINE__).to_s + " ADDING  #{k} : #{_rc}"
-              #           puts "====> #{k} : #{_rc.class} : #{_rc.length}"
-
-
               result.flatten!
             end
-
-
           end
         end
 
       end
 
-
       result=nil if result.empty?
-      puts __FILE__ + (__LINE__).to_s + " result : #{result}"
+      puts __FILE__ + (__LINE__).to_s + " result : #{result}"  if @debug
       result
     end
 
-
-
   end
 
 

data/lib/DataMgr/version.rb

@@ -1,3 +1,3 @@
 module DataMgr
-  VERSION = "0.1.1.1.pre"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DataMgr
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1.pre
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Kim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: tiny_tds
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Manage dynamic data used for test input and output management.
 email:
 - h20dragon@outlook.com
@@ -90,7 +76,6 @@ files:
 - ".gitignore"
 - ".idea/DataMgr.iml"
 - ".idea/encodings.xml"
-- ".idea/vagrant.xml"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -103,6 +88,7 @@ files:
 - bin/setup
 - lib/DataMgr.rb
 - lib/DataMgr/DB/db.rb
+- lib/DataMgr/DSL/dsl.rb
 - lib/DataMgr/Model/data_model.rb
 - lib/DataMgr/version.rb
 homepage: https://github.com/h20dragon
@@ -120,9 +106,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2