.Rbuildignore

@@ -1,10 +1,15 @@
+^CRAN-RELEASE$
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^README.Rmd$
-^NEWS.md$
-^README.md$
-^CONDUCT\.md$
 ^README\.Rmd$
+^README\.html$
+^NEWS\.md$
+^README\.md$
+^CONDUCT\.md$
 ^README-.*\.png$
 ^\.Rhistory$
 ^cran-comments\.md$
+^\.travis\.yml$
+^docs$
+^map\.png$
+^.vscode$

.gitignore

@@ -6,5 +6,4 @@
 *.so
 *.dll
 inst/doc
-config.log
-config.staus
+.vscode

.travis.yml

@@ -0,0 +1,15 @@
+language: r
+warnings_are_errors: true
+sudo: required
+
+env:
+ global:
+   - CRAN: https://cran.rstudio.com
+
+notifications:
+  email:
+    - bob@rud.is
+  irc:
+    channels:
+      - "104.236.112.222#builds"
+    nick: travisci

CONDUCT.md

@@ -22,4 +22,4 @@ opening an issue or contacting one or more of the project maintainers.
 
 This Code of Conduct is adapted from the Contributor Covenant 
 (http:contributor-covenant.org), version 1.0.0, available at 
-http://contributor-covenant.org/version/1/0/0/
+https://contributor-covenant.org/version/1/0/0/

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2018-12-08.
+Once it is accepted, delete this file and tag the release (commit 2848fbc982).

DESCRIPTION

@@ -1,26 +1,35 @@
 Package: iptools
 Type: Package
-Title: Manipulate, Validate and Resolve IP Addresses
-Version: 0.2.0
-Date: 2015-07-01
-Author: Bob Rudis <bob@rudis.net> [aut, cre], Oliver Keyes <ironholds@gmail.com> [aut]
-Maintainer: Bob Rudis <bob@rudis.net>
-Description: A toolkit for manipulating,
-             validating and testing IP addresses and ranges, along with
-             datasets relating to IP addresses. While it primarily has
-             support for the IPv4 address space, more extensive IPv6 support
-             is intended.
+Title: Manipulate, Validate and Resolve 'IP' Addresses
+Version: 0.7.2
+Date: 2021-08-27
+Author: Bob Rudis <bob@rud.is> [aut, cre],
+        Oliver Keyes <ironholds@gmail.com> [aut],
+        Tim Smith [ctb]
+Maintainer: Bob Rudis <bob@rud.is>
+Description: A toolkit for manipulating, validating and testing 'IP' addresses and
+    ranges, along with datasets relating to 'IP' addresses. Tools are also provided
+    to map 'IPv4' blocks to country codes. While it primarily has support for the 'IPv4'
+    address space, more extensive 'IPv6' support is intended.
 License: MIT + file LICENSE
-SystemRequirements: Boost.Asio and Boost.Regex from http://www.boost.org/. See README.
+URL: https://github.com/hrbrmstr/iptools
+BugReports: https://github.com/hrbrmstr/iptools/issues
 NeedsCompilation: yes
-Depends: R (>= 2.10)
+SystemRequirements: C++11
+Depends:
+    R (>= 3.0.0)
 Suggests:
     testthat,
-    knitr
+    knitr,
+    rmarkdown
 Imports:
     Rcpp (>= 0.11.2),
     utils,
-    stats
-LinkingTo: BH, Rcpp
+    stats,
+    AsioHeaders,
+    stringi,
+    triebeard
+Encoding: UTF-8
+LinkingTo: BH, Rcpp, AsioHeaders
 VignetteBuilder: knitr
-OS_type: unix
+RoxygenNote: 7.1.1

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2015
+YEAR: 2016
 COPYRIGHT HOLDER: Bob Rudis & Oliver Keyes

NAMESPACE

@@ -1,19 +1,45 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
+export(asn_table_to_trie)
+export(cached_country_cidrs)
+export(country_ranges)
+export(expand_ipv6)
+export(flush_country_cidrs)
+export(get_all_country_ranges)
+export(hilbert_encode)
+export(host_count)
 export(hostname_to_ip)
 export(iana_assignments_refresh)
 export(iana_ports_refresh)
 export(iana_special_assignments_refresh)
 export(ip_classify)
+export(ip_in_any)
 export(ip_in_range)
+export(ip_numeric_to_binary_string)
 export(ip_random)
+export(ip_to_asn)
+export(ip_to_binary_string)
 export(ip_to_hostname)
 export(ip_to_numeric)
+export(ip_to_subnet)
+export(ips_in_cidrs)
+export(ipv6_to_bytes)
+export(ipv6_to_nibble)
+export(is_ipv4)
+export(is_ipv6)
+export(is_multicast)
+export(is_valid)
 export(numeric_to_ip)
 export(range_boundaries)
+export(range_boundaries_to_cidr)
 export(range_generate)
+export(v6_scope)
 export(validate_range)
+export(xff_extract)
+import(AsioHeaders)
 import(stats)
+import(stringi)
+import(triebeard)
 import(utils)
 importFrom(Rcpp,sourceCpp)
 useDynLib(iptools)

NEWS.md

@@ -1,4 +1,48 @@
-iptools 0.2.0 [WIP]
+iptools 0.7.2
+=============
+* Fixes CRAN checks and removes dependency on {readr} (which appears to be the cause).
+* New `ip6_to_bytes()` and `ip6_to_nibble()`
+* New `ip_to_subnet()` (implements #38)
+
+iptools 0.6.1
+=============
+* Fixed serious bug in `ips_in_cidrs()` introduced after removing tidyverse deps
+* Fixed serious bug in `asn_table_to_trie()` introduced after removing
+  tidyverse deps (Fixes #36)
+* Added tests & examples for all CIDR ops
+* Added test data file for ASN trie ops
+
+iptools 0.6.0
+=============
+* `range_boundaries_to_cidr()` will take a start/stop numeric range
+  and turn it into representative/encompassing CIDR blocks
+
+iptools 0.5.0
+=============
+* NA support added for IP validity checkers and classifiers
+* Hilbert coordiates generator function added
+* `ip_in_any()` added for a more generic range membership test
+* `ip_to_asn()` added (with supporting functions)
+
+iptools 0.4.0
+=============
+* bug fix for `ip_in_range` always returniong TRUE for /32 ranges (@tdsmith)
+* enhanced `range_boundaries()` to include more columns in output
+* added `country_ranges()` which enables obtaining all the IPv4 ranges
+  "assigned" within a country.
+
+iptools 0.3.0
+=============
+* Removal of the need for linking to Boost
+* Windows support!
+* `is_ipv4`, `is_ipv6`, `is_valid` and `is_multicast` added.
+
+iptools 0.2.1
+=============
+* XFF origin extractor included as xff_extract
+* Documentation improvements
+
+iptools 0.2.0
 =============
 NEW FEATURES
 * Total internal rewrite. Check out the vignettes!
@@ -7,7 +51,7 @@ NEW FEATURES
 BUG FIXES
 
 DEVELOPMENT
-*geolocation functionality deprecated; rely on devtools::install_github("ironholds/rgeoip") for geolocation.
+*geolocation functionality deprecated; rely on devtools::install_github("ironholds/rgeolocate") for geolocation.
 *Large changeover to relying on C++ rather than R
 
 iptools 0.1.4