fradium 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce71d5bd193a02708e7df237def67eaea5c5f9be61b550af5a65ca834ede942
-  data.tar.gz: 7d72e9d9c41dc3f96988a3bba3ae7474e4f783c318e7a65ffb6dc130d86aa947
+  metadata.gz: 7ac78d78887194303b1eb5146c87e0a2ed739cc4ebc7436302a1f03fa010df86
+  data.tar.gz: 0bdd1b2862746b1f27fce9b6627d8762a697c6ba73f4f8f7b5298d3af25cec5e
 SHA512:
-  metadata.gz: 3fe0709bfb196128e913d4225967735bb67ae4c2763d4bc6137ed9ea30c0875edc11291a6168c42f5a9a9b1fa01590260e8f100fc8ab173f0cf01a00f7510122
-  data.tar.gz: 2f7c921c15bf3a55ab5f5f26a5786448de55c628c9d78c12689146919fcea32bf139e0fd8e39804a8bb5f593b3dbc882ccd75940d482c20ebc6c5595aca0537f
+  metadata.gz: b612f965e45f3f213aadb8636034c88c8f058175865c2e01d6192084833af4a32baee6dfd66ce670e37e938ce635f68da7bf8c8ad7de7e7085d7162d9cac4d28
+  data.tar.gz: e7709e202d1fc585cce9597554e5a79bfe700ec443ca7909308f74bd5a2569a38d9378b17be04f2945d993d1c94079cb8610b1ef71fd5a09418fede51838b735

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    fradium (0.1.2)
+    fradium (0.1.3)
       mysql2 (~> 0.5)
+      pg (~> 1.1)
       sequel (~> 5.23)
       sqlite3 (~> 1.4)
 
@@ -13,6 +14,7 @@ GEM
     diff-lcs (1.3)
     method_source (0.9.2)
     mysql2 (0.5.2)
+    pg (1.1.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -15,7 +15,7 @@ This software is licensed under the MIT license.
 
 First of all, create a confiuration file called `.fradium.yaml` in your home directory and specify information needed to your RADIUS database. You can define multiple configuration sets called *profile*.
 
-Supported databases are MySQL and MariaDB via `mysql2` adapter so far. It should be work with SQLite or PostgreSQL but still experimental.
+Supported databases are MySQL and MariaDB via `mysql2` adapter so far. It should be work with SQLite 3 or PostgreSQL but still experimental.
 
 ```
 default: # default profile
@@ -31,9 +31,11 @@ staging:
   username: root
   password:
   database: radius_staging
+
+sqlite: "sqlite:///path/to/sqlite_database.sqlite"
 ```
 
-Profiles can be choose by `--profile` option. Specify like `--profile=targetprofile`. If not specified, profile named `default` will be refered by default.
+Profiles can be chosen by `--profile` option. Specify like `--profile=targetprofile`. If not specified, profile named `default` will be refered by default. Parameters defined in this config file are passed to [Sequel#connect](https://www.rubydoc.info/github/evanfarrar/opensprints/Sequel.connect) method as-is.
 
 ### Further usage
 
@@ -41,7 +43,7 @@ It would be easy to use. Running `fradium` without any options will show the usa
 
 ```
 usage:
-  exe/fradium [--profile=profile] subcommand ...
+  fradium [--profile=profile] subcommand ...
 
 subcommands as follows:
   create <username>                   # create new user with password
@@ -49,6 +51,7 @@ subcommands as follows:
   showall                             # show all users
   showvalid                           # show valid(not expired) users
   showexpired                         # show expired users
+  showexpiry                          # show expiry inforrmation
   expire <username>                   # expire the user right now
   unexpire <username>                 # unexpire the user
   setexpire <username> <expiry date>  # set expiry date (date must be parseable by Time#parse)

data/exe/fradium

@@ -42,6 +42,7 @@ subcommands as follows:
   showall                             # show all users
   showvalid                           # show valid(not expired) users
   showexpired                         # show expired users
+  showexpiry                          # show expiry inforrmation
   expire <username>                   # expire the user right now
   unexpire <username>                 # unexpire the user
   setexpire <username> <expiry date>  # set expiry date (date must be parseable by Time#parse)
@@ -99,6 +100,18 @@ when 'showexpired'
     puts e
   end
 
+when 'showexpiry'
+  @f.expiry.each do |e|
+    now = Time.now
+    expiry = Time.parse(e[:value])
+
+    print e[:username]
+    print "\t"
+    print expiry.iso8601
+    print "\tEXPIRED" if now > expiry
+    print "\n"
+  end
+
 when 'expire'
   @f.expire_user(ARGV[1])
 

data/fradium.gemspec

@@ -39,5 +39,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mysql2', '~> 0.5'
   spec.add_dependency 'sqlite3', '~> 1.4'
+  spec.add_dependency 'pg', '~> 1.1'
   spec.add_dependency 'sequel', '~> 5.23'
 end

data/lib/fradium/version.rb

@@ -1,3 +1,3 @@
 class Fradium
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/fradium.rb

@@ -11,13 +11,7 @@ class Fradium
 
   def initialize(params)
     @params = params
-
-    case @params['adapter']
-    when 'sqlite'
-      @sequel = Sequel.connect("sqlite://#{@params['file']}")
-    else
-      @sequel = Sequel.connect(@params)
-    end
+    @sequel = Sequel.connect(@params)
   end
 
   def user_exists?(username)
@@ -54,6 +48,10 @@ class Fradium
     target.update(value: password, attribute: 'Cleartext-Password')
   end
 
+  def expiry
+    @sequel[:radcheck].where(attribute: 'Expiration')
+  end
+
   def expired_users
     now = Time.now
     # a little bit redundant but for consistency
@@ -98,13 +96,24 @@ class Fradium
   end
 
   def dbconsole
-    # I know this is not safe.
-    Kernel.exec({'MYSQL_PWD' => @params['password']},
-                'mysql',
-                "--pager=less -SF",
-                "--user=#{@params['username']}",
-                "--host=#{@params['host']}" ,
-                "#{@params['database']}")
+    case @sequel.adapter_scheme
+    when :mysql2
+      # I know this is not safe.
+      Kernel.exec({'MYSQL_PWD' => @params['password']},
+                  'mysql',
+                  "--pager=less -SF",
+                  "--user=#{@params['username']}",
+                  "--host=#{@params['host']}" ,
+                  "#{@params['database']}")
+    when :postgres
+      Kernel.exec({'PGPASSWORD' => @params['password']},
+                  'psql',
+                  "--username=#{@params['username']}",
+                  "--dbname=#{@params['database']}",
+                  "--host=#{@params['host']}")
+    when :sqlite
+      Kernel.exec('sqlite3', @params)
+    end
   end
 
   def self.generate_random_password(length=10)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fradium
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Koichiro IWAO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement